commit 54cd3a359f20a860b5eb8a6eaea38bffbc945d60 · pyrox.dev/nixpkgs

+6

maintainers/maintainer-list.nix

···

       3704
       3704
        
             fingerprint = "4749 0887 CF3B 85A1 6355  C671 78C7 DD40 DF23 FB16";

     

       3705
       3705
        
           }];

     

       3706
       3706
        
         };

     

       3707
       3707
       +
         DPDmancul = {

     

       3708
       3708
       +
           name = "Davide Peressoni";

     

       3709
       3709
       +
           email = "davide.peressoni@tuta.io";

     

       3710
       3710
       +
           matrix = "@dpd-:matrix.org";

     

       3711
       3711
       +
           githubId = 3186857;

     

       3712
       3712
       +
         };

     

       3707
       3713
        
         dpercy = {

     

       3708
       3714
        
           email = "dpercy@dpercy.dev";

     

       3709
       3715
        
           github = "dpercy";

+5 -3

nixos/modules/config/zram.nix

···

       132
       132
        
             options zram num_devices=${toString cfg.numDevices}

     

       133
       133
        
           '';

     

       134
       134
        
       

     

       135
       135
       +
           boot.kernelParams = ["zram.num_devices=${toString cfg.numDevices}"];

     

       136
       136
       +
       

     

       135
       137
        
           services.udev.extraRules = ''

     

       136
       138
        
             KERNEL=="zram[0-9]*", ENV{SYSTEMD_WANTS}="zram-init-%k.service", TAG+="systemd"

     

       137
       139
        
           '';

     
···

       178
       180
        
                 serviceConfig = {

     

       179
       181
        
                   Type = "oneshot";

     

       180
       182
        
                   RemainAfterExit = true;

     

       181
       181
       -
                   ExecStartPre = "${modprobe} -r zram";

     

       182
       182
       -
                   ExecStart = "${modprobe} zram";

     

       183
       183
       -
                   ExecStop = "${modprobe} -r zram";

     

       183
       183
       +
                   ExecStartPre = "-${modprobe} -r zram";

     

       184
       184
       +
                   ExecStart = "-${modprobe} zram";

     

       185
       185
       +
                   ExecStop = "-${modprobe} -r zram";

     

       184
       186
        
                 };

     

       185
       187
        
                 restartTriggers = [

     

       186
       188
        
                   cfg.numDevices

+16 -8

nixos/modules/programs/firejail.nix

···

       8
       8
        
         wrappedBins = pkgs.runCommand "firejail-wrapped-binaries"

     

       9
       9
        
           { preferLocalBuild = true;

     

       10
       10
        
             allowSubstitutes = false;

     

       11
       11
       +
             # take precedence over non-firejailed versions

     

       12
       12
       +
             meta.priority = -1;

     

       11
       13
        
           }

     

       12
       14
        
           ''

     

       13
       15
        
             mkdir -p $out/bin

     

       16
       16
       +
             mkdir -p $out/share/applications

     

       14
       17
        
             ${lib.concatStringsSep "\n" (lib.mapAttrsToList (command: value:

     

       15
       18
        
             let

     

       16
       19
        
               opts = if builtins.isAttrs value

     

       17
       20
        
               then value

     

       18
       18
       -
               else { executable = value; profile = null; extraArgs = []; };

     

       21
       21
       +
               else { executable = value; desktop = null; profile = null; extraArgs = []; };

     

       19
       22
        
               args = lib.escapeShellArgs (

     

       20
       23
        
                 opts.extraArgs

     

       21
       24
        
                 ++ (optional (opts.profile != null) "--profile=${toString opts.profile}")

     

       22
       22
       -
                 );

     

       25
       25
       +
               );

     

       23
       26
        
             in

     

       24
       27
        
             ''

     

       25
       28
        
               cat <<_EOF >$out/bin/${command}

     
···

       27
       30
        
               exec /run/wrappers/bin/firejail ${args} -- ${toString opts.executable} "\$@"

     

       28
       31
        
               _EOF

     

       29
       32
        
               chmod 0755 $out/bin/${command}

     

       33
       33
       +
       

     

       34
       34
       +
               ${lib.optionalString (opts.desktop != null) ''

     

       35
       35
       +
                 substitute ${opts.desktop} $out/share/applications/$(basename ${opts.desktop}) \

     

       36
       36
       +
                   --replace ${opts.executable} $out/bin/${command}

     

       37
       37
       +
               ''}

     

       30
       38
        
             '') cfg.wrappedBinaries)}

     

       31
       39
        
           '';

     

       32
       40
        
       

     
···

       42
       50
        
                   description = lib.mdDoc "Executable to run sandboxed";

     

       43
       51
        
                   example = literalExpression ''"''${lib.getBin pkgs.firefox}/bin/firefox"'';

     

       44
       52
        
                 };

     

       53
       53
       +
                 desktop = mkOption {

     

       54
       54
       +
                   type = types.nullOr types.path;

     

       55
       55
       +
                   default = null;

     

       56
       56
       +
                   description = lib.mkDoc ".desktop file to modify. Only necessary if it uses the absolute path to the executable.";

     

       57
       57
       +
                   example = literalExpression ''"''${pkgs.firefox}/share/applications/firefox.desktop"'';

     

       58
       58
       +
                 };

     

       45
       59
        
                 profile = mkOption {

     

       46
       60
        
                   type = types.nullOr types.path;

     

       47
       61
        
                   default = null;

     
···

       71
       85
        
             '';

     

       72
       86
        
             description = lib.mdDoc ''

     

       73
       87
        
               Wrap the binaries in firejail and place them in the global path.

     

       74
       74
       -
       

     

       75
       75
       -
               You will get file collisions if you put the actual application binary in

     

       76
       76
       -
               the global environment (such as by adding the application package to

     

       77
       77
       -
               `environment.systemPackages`), and applications started via

     

       78
       78
       -
               .desktop files are not wrapped if they specify the absolute path to the

     

       79
       79
       -
               binary.

     

       80
       88
        
             '';

     

       81
       89
        
           };

     

       82
       90
        
         };

+1 -1

nixos/modules/services/backup/borgbackup.nix

···

       58
       58
        
         '' + optionalString (cfg.prune.keep != { }) ''

     

       59
       59
        
           borg prune $extraArgs \

     

       60
       60
        
             ${mkKeepArgs cfg} \

     

       61
       61
       -
             ${optionalString (cfg.prune.prefix != null) "--prefix ${escapeShellArg cfg.prune.prefix} \\"}

     

       61
       61
       +
             ${optionalString (cfg.prune.prefix != null) "--glob-archives ${escapeShellArg "${cfg.prune.prefix}*"}"} \

     

       62
       62
        
             $extraPruneArgs

     

       63
       63
        
           ${cfg.postPrune}

     

       64
       64
        
         '';

+26 -1

nixos/modules/services/databases/surrealdb.nix

···

       37
       37
        
               default = 8000;

     

       38
       38
        
               example = 8000;

     

       39
       39
        
             };

     

       40
       40
       +
       

     

       41
       41
       +
             userNamePath = mkOption {

     

       42
       42
       +
               type = types.path;

     

       43
       43
       +
               description = lib.mdDoc ''

     

       44
       44
       +
                 Path to read the username from.

     

       45
       45
       +
               '';

     

       46
       46
       +
             };

     

       47
       47
       +
       

     

       48
       48
       +
             passwordPath = mkOption {

     

       49
       49
       +
               type = types.path;

     

       50
       50
       +
               description = lib.mdDoc ''

     

       51
       51
       +
                 Path to read the password from.

     

       52
       52
       +
               '';

     

       53
       53
       +
             };

     

       40
       54
        
           };

     

       41
       55
        
         };

     

       42
       56
        
       

     
···

       50
       64
        
             wantedBy = [ "multi-user.target" ];

     

       51
       65
        
             after = [ "network.target" ];

     

       52
       66
        
       

     

       67
       67
       +
             script = ''

     

       68
       68
       +
               ${pkgs.surrealdb}/bin/surreal start \

     

       69
       69
       +
                 --user $(${pkgs.systemd}/bin/systemd-creds cat SURREALDB_USERNAME) \

     

       70
       70
       +
                 --pass $(${pkgs.systemd}/bin/systemd-creds cat SURREALDB_PASSWORD) \

     

       71
       71
       +
                 --bind ${cfg.host}:${toString cfg.port} \

     

       72
       72
       +
                 -- ${cfg.dbPath}

     

       73
       73
       +
             '';

     

       53
       74
        
             serviceConfig = {

     

       54
       54
       -
               ExecStart = "${pkgs.surrealdb}/bin/surreal start --bind ${cfg.host}:${toString cfg.port} ${optionalString (cfg.dbPath != null) "-- ${cfg.dbPath}"}";

     

       75
       75
       +
               LoadCredential = [

     

       76
       76
       +
                 "SURREALDB_USERNAME:${cfg.userNamePath}"

     

       77
       77
       +
                 "SURREALDB_PASSWORD:${cfg.passwordPath}"

     

       78
       78
       +
               ];

     

       79
       79
       +
       

     

       55
       80
        
               DynamicUser = true;

     

       56
       81
        
               Restart = "on-failure";

     

       57
       82
        
               StateDirectory = "surrealdb";

+3 -2

nixos/modules/services/web-apps/mastodon.nix

···

       658
       658
        
             recommendedProxySettings = true; # required for redirections to work

     

       659
       659
        
             virtualHosts."${cfg.localDomain}" = {

     

       660
       660
        
               root = "${cfg.package}/public/";

     

       661
       661
       -
               forceSSL = true; # mastodon only supports https

     

       662
       662
       -
               enableACME = true;

     

       661
       661
       +
               # mastodon only supports https, but you can override this if you offload tls elsewhere.

     

       662
       662
       +
               forceSSL = lib.mkDefault true;

     

       663
       663
       +
               enableACME = lib.mkDefault true;

     

       663
       664
        
       

     

       664
       665
        
               locations."/system/".alias = "/var/lib/mastodon/public-system/";

     

       665
       666

+33

pkgs/applications/audio/alsa-scarlett-gui/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , pkg-config

     

       5
       5
       +
       , alsa-lib

     

       6
       6
       +
       , gtk4

     

       7
       7
       +
       , wrapGAppsHook4

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       stdenv.mkDerivation rec {

     

       11
       11
       +
         pname = "alsa-scarlett-gui";

     

       12
       12
       +
         version = "unstable-2022-08-11";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "geoffreybennett";

     

       16
       16
       +
           repo = pname;

     

       17
       17
       +
           rev = "65c0f6aa432501355803a823be1d3f8aafe907a8";

     

       18
       18
       +
           sha256 = "sha256-wzBOPTs8PTHzu5RpKwKhx552E7QnDx2Zn4OFaes8Q2I=";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         makeFlags = [ "DESTDIR=\${out}" "PREFIX=''" ];

     

       22
       22
       +
         sourceRoot = "source/src";

     

       23
       23
       +
         nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];

     

       24
       24
       +
         buildInputs = [ gtk4 alsa-lib ];

     

       25
       25
       +
       

     

       26
       26
       +
         meta = with lib; {

     

       27
       27
       +
           description = "GUI for alsa controls presented by Focusrite Scarlett Gen 2/3 Mixer Driver";

     

       28
       28
       +
           homepage = "https://github.com/geoffreybennett/alsa-scarlett-gui";

     

       29
       29
       +
           license = licenses.gpl3Plus;

     

       30
       30
       +
           maintainers = with maintainers; [ sebtm ];

     

       31
       31
       +
           platforms = platforms.linux;

     

       32
       32
       +
         };

     

       33
       33
       +
       }

+2 -2

pkgs/applications/audio/mopidy/mopidy.nix

···

       4
       4
        
       

     

       5
       5
        
       pythonPackages.buildPythonApplication rec {

     

       6
       6
        
         pname = "mopidy";

     

       7
       7
       -
         version = "3.4.0";

     

       7
       7
       +
         version = "3.4.1";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "mopidy";

     

       11
       11
        
           repo = "mopidy";

     

       12
       12
        
           rev = "refs/tags/v${version}";

     

       13
       13
       -
           sha256 = "sha256-cr4v1ScrXLRjqlsCXTm0KvLc+jJbFX1HVKJLrDAtIw8=";

     

       13
       13
       +
           sha256 = "sha256-IUQe5WH2vsrAOgokhTNVVM3lnJXphT2xNGu27hWBLSo=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ wrapGAppsHook ];

-2

pkgs/applications/misc/bleachbit/default.nix

···

       7
       7
        
       , glib

     

       8
       8
        
       , gtk3

     

       9
       9
        
       , libnotify

     

       10
       10
       -
       , scandir ? null

     

       11
       10
        
       }:

     

       12
       11
        
       

     

       13
       12
        
       python3Packages.buildPythonApplication rec {

     
···

       37
       36
        
           chardet

     

       38
       37
        
           pygobject3

     

       39
       38
        
           requests

     

       40
       40
       -
           scandir

     

       41
       39
        
         ];

     

       42
       40
        
       

     

       43
       41
        
         # Patch the many hardcoded uses of /usr/share/ and /usr/bin

+2 -2

pkgs/applications/misc/metadata-cleaner/default.nix

···

       18
       18
        
       

     

       19
       19
        
       python3.pkgs.buildPythonApplication rec {

     

       20
       20
        
         pname = "metadata-cleaner";

     

       21
       21
       -
         version = "2.2.7";

     

       21
       21
       +
         version = "2.2.8";

     

       22
       22
        
       

     

       23
       23
        
         format = "other";

     

       24
       24
        
       

     
···

       26
       26
        
           owner = "rmnvgr";

     

       27
       27
        
           repo = pname;

     

       28
       28
        
           rev = "v${version}";

     

       29
       29
       -
           hash = "sha256-Kqvnw0cPPkqgJQdc6vkP4U96AQuyFSNMQTzTdIUghWw=";

     

       29
       29
       +
           hash = "sha256-646jGcgcEbhHk3PWdkKHWLVX8bNIB3BmYVMoXaGxHUw=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         nativeBuildInputs = [

+2 -2

pkgs/applications/networking/browsers/luakit/default.nix

···

       15
       15
        
       

     

       16
       16
        
       stdenv.mkDerivation rec {

     

       17
       17
        
         pname = "luakit";

     

       18
       18
       -
         version = "2.3.1";

     

       18
       18
       +
         version = "2.3.3";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "luakit";

     

       22
       22
        
           repo = pname;

     

       23
       23
        
           rev = version;

     

       24
       24
       -
           hash = "sha256-6baN3e5ZJ8hw6mhQ0AapyVIYFSdmXcfo45ReQNliIPw=";

     

       24
       24
       +
           hash = "sha256-DtoixcLq+ddbacTAo+Qq6q4k1i6thirACw1zqUeOxXo=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [

+11 -11

pkgs/applications/networking/cluster/terraform-providers/providers.json

···

       103
       103
        
           "vendorHash": "sha256-yDkox74g0N8iniWHSNk6KjfM0HJa8H2HUxm6RxrdhkE="

     

       104
       104
        
         },

     

       105
       105
        
         "aviatrix": {

     

       106
       106
       -
           "hash": "sha256-1zHaSdDcGynLhgLMDRbRgRzt0IvQI25TDZrYzZwwQ34=",

     

       106
       106
       +
           "hash": "sha256-2KJVXIThZ3g1++y5fhKLQjeXZ9r685B8stmWfs2MAs0=",

     

       107
       107
        
           "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix",

     

       108
       108
        
           "owner": "AviatrixSystems",

     

       109
       109
        
           "repo": "terraform-provider-aviatrix",

     

       110
       110
       -
           "rev": "v2.24.1",

     

       110
       110
       +
           "rev": "v3.0.0",

     

       111
       111
        
           "spdx": "MPL-2.0",

     

       112
       112
        
           "vendorHash": null

     

       113
       113
        
         },

     
···

       130
       130
        
           "vendorHash": null

     

       131
       131
        
         },

     

       132
       132
        
         "azurerm": {

     

       133
       133
       -
           "hash": "sha256-2RjraGiMtITdBJ47crqlqFR51WbKpk4U6fkGHCTNXuo=",

     

       133
       133
       +
           "hash": "sha256-GNp4Am/ooMm//LGMMxJlMxQIh4rHmQdnpVEYZn3Hjb8=",

     

       134
       134
        
           "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",

     

       135
       135
        
           "owner": "hashicorp",

     

       136
       136
        
           "repo": "terraform-provider-azurerm",

     

       137
       137
       -
           "rev": "v3.34.0",

     

       137
       137
       +
           "rev": "v3.35.0",

     

       138
       138
        
           "spdx": "MPL-2.0",

     

       139
       139
        
           "vendorHash": null

     

       140
       140
        
         },

     
···

       424
       424
        
           "vendorHash": "sha256-cStVmI58V46I3MYYYrbCY3llnOx2pyuM2Ku+rhe5DVQ="

     

       425
       425
        
         },

     

       426
       426
        
         "github": {

     

       427
       427
       -
           "hash": "sha256-1C/GG3VhQfnU71rucYefpRsfrS//lpPXHqT/QAHM2z0=",

     

       427
       427
       +
           "hash": "sha256-o7Sge0rCfP6Yueq+DP7siBsEinawgGe+nEu0/Olu8uQ=",

     

       428
       428
        
           "homepage": "https://registry.terraform.io/providers/integrations/github",

     

       429
       429
        
           "owner": "integrations",

     

       430
       430
        
           "repo": "terraform-provider-github",

     

       431
       431
       -
           "rev": "v5.11.0",

     

       431
       431
       +
           "rev": "v5.12.0",

     

       432
       432
        
           "spdx": "MIT",

     

       433
       433
        
           "vendorHash": null

     

       434
       434
        
         },

     
···

       507
       507
        
           "vendorHash": null

     

       508
       508
        
         },

     

       509
       509
        
         "heroku": {

     

       510
       510
       -
           "hash": "sha256-GmrzvE1Wc1dQSlEL4mLYHIkAVxKwElx2fCWkrnZra18=",

     

       510
       510
       +
           "hash": "sha256-6SNBi4hSGD6XhUSmIOjmPVzo2HnvRBGFW1jMHJLDhuI=",

     

       511
       511
        
           "homepage": "https://registry.terraform.io/providers/heroku/heroku",

     

       512
       512
        
           "owner": "heroku",

     

       513
       513
        
           "repo": "terraform-provider-heroku",

     

       514
       514
       -
           "rev": "v5.1.8",

     

       514
       514
       +
           "rev": "v5.1.9",

     

       515
       515
        
           "spdx": "MPL-2.0",

     

       516
       516
        
           "vendorHash": null

     

       517
       517
        
         },

     
···

       734
       734
        
           "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="

     

       735
       735
        
         },

     

       736
       736
        
         "minio": {

     

       737
       737
       -
           "hash": "sha256-mtguRBSa+XrpUqEXb9voDHraae9fOaayX1nQpaeAlo4=",

     

       737
       737
       +
           "hash": "sha256-QMaK/c4Rv7rChiVVGY8JizqTfLY98HwONyu5qU/LPGQ=",

     

       738
       738
        
           "homepage": "https://registry.terraform.io/providers/aminueza/minio",

     

       739
       739
        
           "owner": "aminueza",

     

       740
       740
        
           "repo": "terraform-provider-minio",

     

       741
       741
       -
           "rev": "v1.9.1",

     

       741
       741
       +
           "rev": "v1.10.0",

     

       742
       742
        
           "spdx": "Apache-2.0",

     

       743
       743
       -
           "vendorHash": "sha256-VxISNcWEnBAa+8WsmqxcT+DPF74X8rLlvdSNJtx0++I="

     

       743
       743
       +
           "vendorHash": "sha256-w/1eNrXK4Zpt80J1FidnhMAD0lhSskHMt/hrdrgfSYw="

     

       744
       744
        
         },

     

       745
       745
        
         "mongodbatlas": {

     

       746
       746
        
           "hash": "sha256-QMwsVD1RZwL9DPF0gnio4quqUa1b4G0SK73yd6BYnG4=",

+4 -4

pkgs/applications/networking/instant-messengers/discord/default.nix

···

       2
       2
        
       let

     

       3
       3
        
         versions = if stdenv.isLinux then {

     

       4
       4
        
           stable = "0.0.21";

     

       5
       5
       -
           ptb = "0.0.35";

     

       6
       6
       -
           canary = "0.0.144";

     

       5
       5
       +
           ptb = "0.0.38";

     

       6
       6
       +
           canary = "0.0.145";

     

       7
       7
        
         } else {

     

       8
       8
        
           stable = "0.0.264";

     

       9
       9
        
           ptb = "0.0.59";

     
···

       18
       18
        
             };

     

       19
       19
        
             ptb = fetchurl {

     

       20
       20
        
               url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";

     

       21
       21
       -
               sha256 = "bnp5wfcR21s7LMPxFgj5G3UsxPWlFj4t6CbeosiufHY=";

     

       21
       21
       +
               sha256 = "bPg7ZNQQxEpRSpp8j5/XLBDEJyId8mDGxS6tqkzzI1s=";

     

       22
       22
        
             };

     

       23
       23
        
             canary = fetchurl {

     

       24
       24
        
               url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

     

       25
       25
       -
               sha256 = "sha256-/le3YT8djSj60H+Pq1qUxqc8CNgEZladOeFa9D2ZGl8=";

     

       25
       25
       +
               sha256 = "sha256-TF+7SnCTsbh+Z8AeEESEFVLSpD3c5HOAwpU1UBuB1BU=";

     

       26
       26
        
             };

     

       27
       27
        
           };

     

       28
       28
        
           x86_64-darwin = {

+3 -2

pkgs/applications/networking/nextcloud-client/default.nix

···

       26
       26
        
       

     

       27
       27
        
       mkDerivation rec {

     

       28
       28
        
         pname = "nextcloud-client";

     

       29
       29
       -
         version = "3.6.2";

     

       29
       29
       +
         version = "3.6.4";

     

       30
       30
        
       

     

       31
       31
        
         outputs = [ "out" "dev" ];

     

       32
       32
        
       

     
···

       34
       34
        
           owner = "nextcloud";

     

       35
       35
        
           repo = "desktop";

     

       36
       36
        
           rev = "v${version}";

     

       37
       37
       -
           sha256 = "sha256-eTcQrbYYY+V87i6PuIEWCFczIqL8oxtdojPY/mZpJBU=";

     

       37
       37
       +
           sha256 = "sha256-ZtDgm9xlBQflVXsxjt4bFmRby6ni0wjaGYaoiEWH9Q0=";

     

       38
       38
        
         };

     

       39
       39
        
       

     

       40
       40
        
         patches = [

     
···

       82
       82
        
         ];

     

       83
       83
        
       

     

       84
       84
        
         cmakeFlags = [

     

       85
       85
       +
           "-DBUILD_UPDATER=off"

     

       85
       86
        
           "-DCMAKE_INSTALL_LIBDIR=lib" # expected to be prefix-relative by build code setting RPATH

     

       86
       87
        
           "-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit

     

       87
       88
        
         ];

+2 -1

pkgs/applications/networking/p2p/transmission/default.nix

···

       16
       16
        
       , miniupnpc

     

       17
       17
        
       , dht

     

       18
       18
        
       , libnatpmp

     

       19
       19
       +
       , libiconv

     

       19
       20
        
         # Build options

     

       20
       21
        
       , enableGTK3 ? false

     

       21
       22
        
       , gtk3

     
···

       93
       94
        
         ++ lib.optionals enableGTK3 [ gtk3 xorg.libpthreadstubs ]

     

       94
       95
        
         ++ lib.optionals enableSystemd [ systemd ]

     

       95
       96
        
         ++ lib.optionals stdenv.isLinux [ inotify-tools ]

     

       96
       96
       -
         ;

     

       97
       97
       +
         ++ lib.optionals stdenv.isDarwin [ libiconv ];

     

       97
       98
        
       

     

       98
       99
        
         postInstall = ''

     

       99
       100
        
           mkdir $apparmor

+3 -13

pkgs/applications/networking/pjsip/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit, fetchpatch }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "pjsip";

     

       5
       5
       -
         version = "2.12.1";

     

       5
       5
       +
         version = "2.13";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = pname;

     

       9
       9
        
           repo = "pjproject";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-HIDL4xzzTu3irzrIOf8qSNCAvHGOMpi8EDeqZb8mMnc=";

     

       11
       11
       +
           sha256 = "sha256-yzszmm3uIyXtYFgZtUP3iswLx4u/8UbFt80Ln25ToFE=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         patches = [

     

       15
       15
        
           ./fix-aarch64.patch

     

       16
       16
       -
           (fetchpatch {

     

       17
       17
       -
             name = "CVE-2022-39269.patch";

     

       18
       18
       -
             url = "https://github.com/pjsip/pjproject/commit/d2acb9af4e27b5ba75d658690406cec9c274c5cc.patch";

     

       19
       19
       -
             sha256 = "sha256-bKE/MrRAqN1FqD2ubhxIOOf5MgvZluHHeVXPjbR12iQ=";

     

       20
       20
       -
           })

     

       21
       21
       -
           (fetchpatch {

     

       22
       22
       -
             name = "CVE-2022-39244.patch";

     

       23
       23
       -
             url = "https://github.com/pjsip/pjproject/commit/c4d34984ec92b3d5252a7d5cddd85a1d3a8001ae.patch";

     

       24
       24
       -
             sha256 = "sha256-hTUMh6bYAizn6GF+sRV1vjKVxSf9pnI+eQdPOqsdJI4=";

     

       25
       25
       -
           })

     

       26
       16
        
         ];

     

       27
       17
        
       

     

       28
       18
        
         buildInputs = [ openssl libsamplerate ]

+5

pkgs/applications/networking/remote/rustdesk/default.nix

···

       38
       38
        
           sha256 = "sha256-IlrfqwNyaSHE9Ct0mn7MUxEg7p1Ku34eOMYelEAYFW8=";

     

       39
       39
        
         };

     

       40
       40
        
       

     

       41
       41
       +
         patches = [

     

       42
       42
       +
           # based on https://github.com/rustdesk/rustdesk/pull/1900

     

       43
       43
       +
           ./fix-for-rust-1.65.diff

     

       44
       44
       +
         ];

     

       45
       45
       +
       

     

       41
       46
        
         cargoSha256 = "sha256-1OMWEk+DerltF7kwdo4d04rbgIFLHBRq3vZaL7jtrdE=";

     

       42
       47
        
       

     

       43
       48
        
         LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib";

+31

pkgs/applications/networking/remote/rustdesk/fix-for-rust-1.65.diff

···

       1
       1
       +
       diff --git a/libs/hbb_common/src/config.rs b/libs/hbb_common/src/config.rs

     

       2
       2
       +
       index 74982de5..308bcf80 100644

     

       3
       3
       +
       --- a/libs/hbb_common/src/config.rs

     

       4
       4
       +
       +++ b/libs/hbb_common/src/config.rs

     

       5
       5
       +
       @@ -656,7 +656,7 @@ const PEERS: &str = "peers";

     

       6
       6
       +
        

     

       7
       7
       +
        impl PeerConfig {

     

       8
       8
       +
            pub fn load(id: &str) -> PeerConfig {

     

       9
       9
       +
       -        let _ = CONFIG.read().unwrap(); // for lock

     

       10
       10
       +
       +        let _lock = CONFIG.read().unwrap();

     

       11
       11
       +
                match confy::load_path(&Self::path(id)) {

     

       12
       12
       +
                    Ok(config) => config,

     

       13
       13
       +
                    Err(err) => {

     

       14
       14
       +
       @@ -667,7 +667,7 @@ impl PeerConfig {

     

       15
       15
       +
            }

     

       16
       16
       +
        

     

       17
       17
       +
            pub fn store(&self, id: &str) {

     

       18
       18
       +
       -        let _ = CONFIG.read().unwrap(); // for lock

     

       19
       19
       +
       +        let _lock = CONFIG.read().unwrap();

     

       20
       20
       +
                if let Err(err) = confy::store_path(Self::path(id), self) {

     

       21
       21
       +
                    log::error!("Failed to store config: {}", err);

     

       22
       22
       +
                }

     

       23
       23
       +
       @@ -808,7 +808,7 @@ pub struct LanPeers {

     

       24
       24
       +
        

     

       25
       25
       +
        impl LanPeers {

     

       26
       26
       +
            pub fn load() -> LanPeers {

     

       27
       27
       +
       -        let _ = CONFIG.read().unwrap(); // for lock

     

       28
       28
       +
       +        let _lock = CONFIG.read().unwrap();

     

       29
       29
       +
                match confy::load_path(&Config::file_("_lan_peers")) {

     

       30
       30
       +
                    Ok(peers) => peers,

     

       31
       31
       +
                    Err(err) => {

+22 -26

pkgs/applications/office/appflowy/default.nix

···

       1
       1
       -
       { stdenv,

     

       2
       2
       -
         lib,

     

       3
       3
       -
         fetchzip,

     

       4
       4
       -
         autoPatchelfHook,

     

       5
       5
       -
         makeWrapper,

     

       6
       6
       -
         copyDesktopItems,

     

       7
       7
       -
         makeDesktopItem,

     

       8
       8
       -
         gtk3,

     

       9
       9
       -
         openssl,

     

       10
       10
       -
         xdg-user-dirs,

     

       11
       11
       -
         keybinder3

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchzip

     

       4
       4
       +
       , autoPatchelfHook

     

       5
       5
       +
       , makeWrapper

     

       6
       6
       +
       , copyDesktopItems

     

       7
       7
       +
       , makeDesktopItem

     

       8
       8
       +
       , gtk3

     

       9
       9
       +
       , openssl

     

       10
       10
       +
       , xdg-user-dirs

     

       11
       11
       +
       , keybinder3

     

       12
       12
        
       }:

     

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "appflowy";

     

       16
       16
       -
         version = "0.0.6.2";

     

       16
       16
       +
         version = "0.0.8";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchzip {

     

       19
       19
        
           url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-linux-x86.tar.gz";

     

       20
       20
       -
           sha256 = "sha256-LOrXGFctAaiz2z9M8ghrXsQ+qygwNPyYragmL/EjlDQ=";

     

       20
       20
       +
           sha256 = "sha256-+nizRA42c0ZzuN8D/puh0TFLnRJVgyAujcTmJZ1UVzo=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [

     

       24
       24
       -
             autoPatchelfHook

     

       25
       25
       -
             makeWrapper

     

       26
       26
       -
             copyDesktopItems

     

       24
       24
       +
           autoPatchelfHook

     

       25
       25
       +
           makeWrapper

     

       26
       26
       +
           copyDesktopItems

     

       27
       27
        
         ];

     

       28
       28
        
       

     

       29
       29
        
         buildInputs = [

     

       30
       30
       -
             gtk3

     

       31
       31
       -
             openssl

     

       32
       32
       -
             keybinder3

     

       30
       30
       +
           gtk3

     

       31
       31
       +
           openssl

     

       32
       32
       +
           keybinder3

     

       33
       33
        
         ];

     

       34
       34
        
       

     

       35
       35
        
         dontBuild = true;

     
···

       47
       47
        
           runHook postInstall

     

       48
       48
        
         '';

     

       49
       49
        
       

     

       50
       50
       -
         preFixup = let

     

       51
       51
       -
           binPath = lib.makeBinPath [

     

       52
       52
       -
             xdg-user-dirs

     

       53
       53
       -
           ];

     

       54
       54
       -
         in ''

     

       50
       50
       +
         preFixup = ''

     

       55
       51
        
           # Add missing libraries to appflowy using the ones it comes with

     

       56
       52
        
           makeWrapper $out/opt/app_flowy $out/bin/appflowy \

     

       57
       57
       -
                 --set LD_LIBRARY_PATH "$out/opt/lib/" \

     

       58
       58
       -
                 --prefix PATH : "${binPath}"

     

       53
       53
       +
             --set LD_LIBRARY_PATH "$out/opt/lib/" \

     

       54
       54
       +
             --prefix PATH : "${lib.makeBinPath [ xdg-user-dirs ]}"

     

       59
       55
        
         '';

     

       60
       56
        
       

     

       61
       57
        
         desktopItems = [

+11 -6

pkgs/applications/version-management/git-and-tools/git-bug/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "git-bug";

     

       5
       5
       -
         version = "0.7.2"; # the `rev` below pins the version of the source to get

     

       6
       6
       -
         rev = "cc4a93c8ce931b1390c61035b888ad17110b7bd6";

     

       5
       5
       +
         version = "0.8.0"; # the `rev` below pins the version of the source to get

     

       6
       6
       +
         rev = "v0.8.0";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           inherit rev;

     

       10
       10
        
           owner = "MichaelMure";

     

       11
       11
        
           repo = "git-bug";

     

       12
       12
       -
           sha256 = "0r6wh0y1fj3d3fbbrzq5n9k6z94xvwqww3xfbslkgyrin5bmziiq";

     

       12
       12
       +
           sha256 = "12byf6nsamwz0ssigan1z299s01cyh8bhgj86bibl90agd4zs9n8";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         vendorSha256 = "15hhsrwwjc4krfc2d0r15lys3vr9rb9xk62pan4jr9ycbv0dny90";

     

       15
       15
       +
         vendorSha256 = "sha256-32kNDoBE50Jx1Ef9YwhDk7nd3CaTSnHPlu7PgWPUGfE=";

     

       16
       16
        
       

     

       17
       17
        
         doCheck = false;

     

       18
       18
        
       

     
···

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
        
         postInstall = ''

     

       26
       26
       -
           install -D -m 0644 misc/bash_completion/git-bug "$out/share/bash-completion/completions/git-bug"

     

       27
       27
       -
           install -D -m 0644 misc/zsh_completion/git-bug "$out/share/zsh/site-functions/git-bug"

     

       26
       26
       +
           install -D -m 0644 misc/completion/bash/git-bug "$out/share/bash-completion/completions/git-bug"

     

       27
       27
       +
           install -D -m 0644 misc/completion/zsh/git-bug "$out/share/zsh/site-functions/git-bug"

     

       28
       28
        
           install -D -m 0644 -t "$out/share/man/man1" doc/man/*

     

       29
       29
       +
       

     

       30
       30
       +
           # not sure why the following executables are in $out/bin/

     

       31
       31
       +
           rm -f $out/bin/cmd

     

       32
       32
       +
           rm -f $out/bin/completion

     

       33
       33
       +
           rm -f $out/bin/doc

     

       29
       34
        
         '';

     

       30
       35
        
       

     

       31
       36
        
         meta = with lib; {

+2 -2

pkgs/applications/version-management/monotone-viz/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, ocamlPackages, gnome2, pkg-config, makeWrapper, glib

     

       2
       2
       -
       , libtool, libpng, bison, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw

     

       2
       2
       +
       , libtool, libpng, bison, expat, fontconfig, gd, pango, libjpeg, libwebp, libX11, libXaw

     

       3
       3
        
       }:

     

       4
       4
        
       # We need an old version of Graphviz for format compatibility reasons.

     

       5
       5
        
       # This version is vulnerable, but monotone-viz will never feed it bad input.

     

       6
       6
        
       let graphviz_2_0 = import ./graphviz-2.0.nix {

     

       7
       7
       -
             inherit lib stdenv fetchurl pkg-config xlibsWrapper libpng libjpeg expat libXaw

     

       7
       7
       +
             inherit lib stdenv fetchurl pkg-config libX11 libpng libjpeg expat libXaw

     

       8
       8
        
               bison libtool fontconfig pango gd libwebp;

     

       9
       9
        
           }; in

     

       10
       10
        
       let inherit (gnome2) libgnomecanvas; in

+3 -3

pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix

···

       2
       2
        
       , stdenv

     

       3
       3
        
       , fetchurl

     

       4
       4
        
       , pkg-config

     

       5
       5
       -
       , xlibsWrapper

     

       5
       5
       +
       , libX11

     

       6
       6
        
       , libpng

     

       7
       7
        
       , libjpeg

     

       8
       8
        
       , expat

     
···

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [ pkg-config ];

     

       28
       28
        
         buildInputs = [

     

       29
       29
       -
           xlibsWrapper

     

       29
       29
       +
           libX11

     

       30
       30
        
           libpng

     

       31
       31
        
           libjpeg

     

       32
       32
        
           expat

     
···

       52
       52
        
             "--with-ltdl-include=${libtool}/include"

     

       53
       53
        
             "--with-ltdl-lib=${libtool.lib}/lib"

     

       54
       54
        
           ]

     

       55
       55
       -
           ++ lib.optional (xlibsWrapper == null) "--without-x";

     

       55
       55
       +
           ++ lib.optional (libX11 == null) "--without-x";

     

       56
       56
        
       

     

       57
       57
        
         meta = {

     

       58
       58
        
           description = "A program for visualising graphs";

+22 -6

pkgs/applications/version-management/sapling/default.nix

···

       17
       17
        
       , CoreFoundation

     

       18
       18
        
       , CoreServices

     

       19
       19
        
       , Security

     

       20
       20
       +
       

     

       21
       21
       +
       , enableMinimal ? false

     

       20
       22
        
       }:

     

       21
       23
        
       

     

       22
       24
        
       let

     
···

       123
       125
        
             sed -i "s|https://files.pythonhosted.org/packages/[[:alnum:]]*/[[:alnum:]]*/[[:alnum:]]*/|file://$NIX_BUILD_TOP/$sourceRoot/hack_pydeps/|g" $sourceRoot/setup.py

     

       124
       126
        
           '';

     

       125
       127
        
       

     

       128
       128
       +
           # Now, copy the "sl web" (aka edenscm-isl) results into the output of this

     

       129
       129
       +
           # package, so that the command can actually work. NOTES:

     

       130
       130
       +
           #

     

       131
       131
       +
           # 1) This applies on all systems (so no conditional a la postFixup)

     

       132
       132
       +
           # 2) This doesn't require any kind of fixup itself, so we leave it out

     

       133
       133
       +
           #    of postFixup for that reason, too

     

       134
       134
       +
           # 3) If asked, we optionally patch in a hardcoded path to the 'nodejs' package,

     

       135
       135
       +
           #    so that 'sl web' always works

     

       136
       136
       +
           # 4) 'sl web' will still work if 'nodejs' is in $PATH, just not OOTB

     

       137
       137
       +
           preFixup = ''

     

       138
       138
       +
             sitepackages=$out/lib/${python38Packages.python.libPrefix}/site-packages

     

       139
       139
       +
             chmod +w $sitepackages

     

       140
       140
       +
             cp -r ${isl} $sitepackages/edenscm-isl

     

       141
       141
       +
           '' + lib.optionalString (!enableMinimal) ''

     

       142
       142
       +
             chmod +w $sitepackages/edenscm-isl/run-isl

     

       143
       143
       +
             substituteInPlace $sitepackages/edenscm-isl/run-isl \

     

       144
       144
       +
               --replace 'NODE=node' 'NODE=${nodejs}/bin/node'

     

       145
       145
       +
           '';

     

       146
       146
       +
       

     

       126
       147
        
           postFixup = lib.optionalString stdenv.isLinux ''

     

       127
       148
        
             wrapProgram $out/bin/sl \

     

       128
       149
        
               --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive"

     
···

       138
       159
        
           ]);

     

       139
       160
        
       

     

       140
       161
        
           buildInputs = [

     

       141
       141
       -
             curl

     

       142
       162
        
             openssl

     

       143
       163
        
           ] ++ lib.optionals stdenv.isDarwin [

     

       164
       164
       +
             curl

     

       144
       165
        
             libiconv

     

       145
       166
        
             CoreFoundation

     

       146
       167
        
             CoreServices

     
···

       165
       186
        
           runHook preInstall

     

       166
       187
        
       

     

       167
       188
        
           mkdir -p $out

     

       168
       168
       -
       

     

       169
       189
        
           cp -r ${sapling}/* $out

     

       170
       170
       -
       

     

       171
       171
       -
           sitepackages=$out/lib/${python38Packages.python.libPrefix}/site-packages

     

       172
       172
       -
           chmod +w $sitepackages

     

       173
       173
       -
           cp -r ${isl} $sitepackages/edenscm-isl

     

       174
       190
        
       

     

       175
       191
        
           runHook postInstall

     

       176
       192
        
         '';

+4 -2

pkgs/applications/video/streamlink/default.nix

···

       6
       6
        
       

     

       7
       7
        
       python3Packages.buildPythonApplication rec {

     

       8
       8
        
         pname = "streamlink";

     

       9
       9
       -
         version = "5.0.1";

     

       9
       9
       +
         version = "5.1.2";

     

       10
       10
        
         format = "pyproject";

     

       11
       11
        
       

     

       12
       12
        
         src = python3Packages.fetchPypi {

     

       13
       13
        
           inherit pname version;

     

       14
       14
       -
           hash = "sha256-PKRioPBhTV6i3ckQgcKuhQFmpBvUQE4o3FLej8qx4mM=";

     

       14
       14
       +
           hash = "sha256-UB9gTT2/rQXV1Q7UQywEHlGBCJDMDmXupD8nYII4dno=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         checkInputs = with python3Packages; [

     
···

       19
       19
        
           mock

     

       20
       20
        
           requests-mock

     

       21
       21
        
           freezegun

     

       22
       22
       +
           pytest-asyncio

     

       22
       23
        
         ];

     

       23
       24
        
       

     

       24
       25
        
         nativeBuildInputs = with python3Packages; [

     
···

       33
       34
        
           pysocks

     

       34
       35
        
           requests

     

       35
       36
        
           websocket-client

     

       37
       37
       +
           urllib3

     

       36
       38
        
         ]) ++ [

     

       37
       39
        
           ffmpeg

     

       38
       40
        
         ];

+2

pkgs/development/interpreters/luajit/default.nix

···

       127
       127
        
           homepage = "http://luajit.org";

     

       128
       128
        
           license = licenses.mit;

     

       129
       129
        
           platforms = platforms.linux ++ platforms.darwin;

     

       130
       130
       +
           # See https://github.com/LuaJIT/LuaJIT/issues/628

     

       131
       131
       +
           badPlatforms = [ "riscv64-linux" "riscv64-linux" ];

     

       130
       132
        
           maintainers = with maintainers; [ thoughtpolice smironov vcunat lblasc ];

     

       131
       133
        
         } // extraMeta;

     

       132
       134
        
       }

+3 -3

pkgs/development/interpreters/nickel/default.nix

···

       5
       5
        
       

     

       6
       6
        
       rustPlatform.buildRustPackage rec {

     

       7
       7
        
         pname = "nickel";

     

       8
       8
       -
         version = "0.2.1";

     

       8
       8
       +
         version = "0.3.0";

     

       9
       9
        
       

     

       10
       10
        
         src  = fetchFromGitHub {

     

       11
       11
        
           owner = "tweag";

     

       12
       12
        
           repo = pname;

     

       13
       13
        
           rev = "refs/tags/${version}"; # because pure ${version} doesn't work

     

       14
       14
       -
           hash = "sha256-Sf0UJAfUtP7oU31VkVqCtdRmfjaHV34gYeUPNsTmQvo=";

     

       14
       14
       +
           hash = "sha256-L2MQ0dS9mZ+SOFoS/rclPtEl3/iFyEKn6Bse/ysHyKo=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         cargoSha256 = "sha256-oY4PYMZBN5+nsARHV+A5D7a6fUt9UMHBn83ONgaQp8E=";

     

       17
       17
       +
         cargoSha256 = "sha256-3ucWGmylRatJOl8zktSRMXr5p6L+5+LQV6ALJTtQpiA=";

     

       18
       18
        
       

     

       19
       19
        
         meta = with lib; {

     

       20
       20
        
           homepage = "https://nickel-lang.org/";

+2 -2

pkgs/development/libraries/aws-c-mqtt/default.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "aws-c-mqtt";

     

       16
       16
       -
         version = "0.8.0";

     

       16
       16
       +
         version = "0.8.1";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "awslabs";

     

       20
       20
        
           repo = "aws-c-mqtt";

     

       21
       21
        
           rev = "v${version}";

     

       22
       22
       -
           sha256 = "sha256-+Ah3D+cgGfunX46Fqv6NSNAOzVwrRdZz6oJKP+tHCmU=";

     

       22
       22
       +
           sha256 = "sha256-nmSNG5o2Ck80OG4ZGYIayVdnw3Z2fn1VkUIuI9RYfL8=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [

+2 -2

pkgs/development/libraries/libmodbus/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "libmodbus";

     

       5
       5
       -
         version = "3.1.9";

     

       5
       5
       +
         version = "3.1.10";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "stephane";

     

       9
       9
        
           repo = "libmodbus";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           hash = "sha256-aq8JB7CgzK6idU9AAJWkMXyYDXRynSTlNBMyPrNdpLw=";

     

       11
       11
       +
           hash = "sha256-e2lB5D41a5MOmz9M90ZXfIltSOxNDOrQUpRNU2yYd1k=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ autoreconfHook ];

+8 -3

pkgs/development/libraries/ois/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "ois";

     

       5
       5
       -
         version = "1.5";

     

       5
       5
       +
         version = "1.5.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "wgois";

     

       9
       9
        
           repo = "OIS";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "0g8krgq5bdx2rw7ig0xva4kqv4x815672i7z6lljp3n8847wmypa";

     

       11
       11
       +
           sha256 = "sha256-ir6p+Tzf8L5VOW/rsG4yelsth7INbhABO2T7pfMHcFo=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ cmake ];

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ libX11 ] ++ lib.optionals stdenv.isDarwin [ Cocoa IOKit Kernel ];

     

       16
       16
       +
         buildInputs = lib.optionals stdenv.isLinux [ libX11 ]

     

       17
       17
       +
           ++ lib.optionals stdenv.isDarwin [ Cocoa IOKit Kernel ];

     

       18
       18
       +
       

     

       19
       19
       +
         cmakeFlags = [

     

       20
       20
       +
           "-DCMAKE_INSTALL_LIBDIR=lib"

     

       21
       21
       +
         ];

     

       17
       22
        
       

     

       18
       23
        
         meta = with lib; {

     

       19
       24
        
           description = "Object-oriented C++ input system";

+2 -2

pkgs/development/libraries/physics/clhep/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "clhep";

     

       9
       9
       -
         version = "2.4.6.1";

     

       9
       9
       +
         version = "2.4.6.2";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchurl {

     

       12
       12
        
           url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz";

     

       13
       13
       -
           hash = "sha256-FwFhuOSYVV91xt55Nq/elWqT/JqhIaFtd56mAgh6Mjk=";

     

       13
       13
       +
           hash = "sha256-re1z5JushaW06G9koO49bzz+VVGw93MceLbY+drG6Nw=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         prePatch = ''

+5 -1

pkgs/development/libraries/science/math/liblapack/default.nix

···

       30
       30
        
           "-DCBLAS=ON"

     

       31
       31
        
           "-DBUILD_TESTING=ON"

     

       32
       32
        
         ] ++ lib.optional shared "-DBUILD_SHARED_LIBS=ON"

     

       33
       33
       -
           ++ lib.optional blas64 "-DBUILD_INDEX64=ON";

     

       33
       33
       +
           ++ lib.optional blas64 "-DBUILD_INDEX64=ON"

     

       34
       34
       +
           # Tries to run host platform binaries during the build

     

       35
       35
       +
           # Will likely be disabled by default in 3.12, see:

     

       36
       36
       +
           # https://github.com/Reference-LAPACK/lapack/issues/757

     

       37
       37
       +
           ++ lib.optional (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) "-DTEST_FORTRAN_COMPILER=OFF";

     

       34
       38
        
       

     

       35
       39
        
         passthru = { inherit blas64; };

     

       36
       40

+2 -2

pkgs/development/misc/brev-cli/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "brev-cli";

     

       8
       8
       -
         version = "0.6.185";

     

       8
       8
       +
         version = "0.6.186";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "brevdev";

     

       12
       12
        
           repo = pname;

     

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

     

       14
       14
       -
           sha256 = "sha256-vxU+UDPnW4OfhEs66ynN7tFbi8aIHIgLFx/jx+2Fp2w=";

     

       14
       14
       +
           sha256 = "sha256-h8PUxSjC21BsjqFgOOvDPClFLwOTFTTEB57zxUtbuTw=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         vendorSha256 = "sha256-uaLoh1VhJAT5liGqL77DLhAWviy5Ci8B16LuzCWuek8=";

+1

pkgs/development/misc/resholve/default.nix

···

       22
       22
        
         resholve = callPackage ./resholve.nix {

     

       23
       23
        
           inherit (source) rSrc version;

     

       24
       24
        
           inherit (deps.oil) oildev;

     

       25
       25
       +
           inherit (deps) configargparse;

     

       25
       26
        
           inherit resholve-utils;

     

       26
       27
        
         };

     

       27
       28
        
         # funcs to validate and phrase invocations of resholve

+63 -2

pkgs/development/misc/resholve/deps.nix

···

       1
       1
       -
       { callPackage

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , callPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       2
       4
        
       , python27

     

       3
       5
        
       , ...

     

       4
       6
        
       }:

     
···

       15
       17
        
       

     

       16
       18
        
       rec {

     

       17
       19
        
         # binlore = callPackage ./binlore.nix { };

     

       18
       18
       -
         oil = callPackage ./oildev.nix { inherit python27; };

     

       20
       20
       +
         oil = callPackage ./oildev.nix {

     

       21
       21
       +
           inherit python27;

     

       22
       22
       +
           inherit six;

     

       23
       23
       +
           inherit typing;

     

       24
       24
       +
         };

     

       25
       25
       +
         configargparse = python27.pkgs.buildPythonPackage rec {

     

       26
       26
       +
           pname = "configargparse";

     

       27
       27
       +
           version = "1.5.3";

     

       28
       28
       +
       

     

       29
       29
       +
           src = fetchFromGitHub {

     

       30
       30
       +
             owner = "bw2";

     

       31
       31
       +
             repo = "ConfigArgParse";

     

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

     

       33
       33
       +
             sha256 = "1dsai4bilkp2biy9swfdx2z0k4akw4lpvx12flmk00r80hzgbglz";

     

       34
       34
       +
           };

     

       35
       35
       +
       

     

       36
       36
       +
           doCheck = false;

     

       37
       37
       +
       

     

       38
       38
       +
           pythonImportsCheck = [ "configargparse" ];

     

       39
       39
       +
       

     

       40
       40
       +
           meta = with lib; {

     

       41
       41
       +
             description = "A drop-in replacement for argparse";

     

       42
       42
       +
             homepage = "https://github.com/bw2/ConfigArgParse";

     

       43
       43
       +
             license = licenses.mit;

     

       44
       44
       +
           };

     

       45
       45
       +
         };

     

       46
       46
       +
         six = python27.pkgs.buildPythonPackage rec {

     

       47
       47
       +
           pname = "six";

     

       48
       48
       +
           version = "1.16.0";

     

       49
       49
       +
       

     

       50
       50
       +
           src = python27.pkgs.fetchPypi {

     

       51
       51
       +
             inherit pname version;

     

       52
       52
       +
             sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926";

     

       53
       53
       +
           };

     

       54
       54
       +
       

     

       55
       55
       +
           doCheck = false;

     

       56
       56
       +
       

     

       57
       57
       +
           meta = {

     

       58
       58
       +
             description = "A Python 2 and 3 compatibility library";

     

       59
       59
       +
             homepage = "https://pypi.python.org/pypi/six/";

     

       60
       60
       +
             license = lib.licenses.mit;

     

       61
       61
       +
           };

     

       62
       62
       +
         };

     

       63
       63
       +
         typing = python27.pkgs.buildPythonPackage rec {

     

       64
       64
       +
           pname = "typing";

     

       65
       65
       +
           version = "3.10.0.0";

     

       66
       66
       +
       

     

       67
       67
       +
           src = python27.pkgs.fetchPypi {

     

       68
       68
       +
             inherit pname version;

     

       69
       69
       +
             sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130";

     

       70
       70
       +
           };

     

       71
       71
       +
       

     

       72
       72
       +
           doCheck = false;

     

       73
       73
       +
       

     

       74
       74
       +
           meta = with lib; {

     

       75
       75
       +
             description = "Backport of typing module to Python versions older than 3.5";

     

       76
       76
       +
             homepage = "https://docs.python.org/3/library/typing.html";

     

       77
       77
       +
             license = licenses.psfl;

     

       78
       78
       +
           };

     

       79
       79
       +
         };

     

       19
       80
        
       }

+3 -1

pkgs/development/misc/resholve/oildev.nix

···

       13
       13
        
       , cmark

     

       14
       14
        
       , file

     

       15
       15
        
       , glibcLocales

     

       16
       16
       +
       , six

     

       17
       17
       +
       , typing

     

       16
       18
        
       }:

     

       17
       19
        
       

     

       18
       20
        
       rec {

     
···

       95
       97
        
       

     

       96
       98
        
           nativeBuildInputs = [ re2c file makeWrapper ];

     

       97
       99
        
       

     

       98
       98
       -
           propagatedBuildInputs = with python27.pkgs; [ six typing ];

     

       100
       100
       +
           propagatedBuildInputs = [ six typing ];

     

       99
       101
        
       

     

       100
       102
        
           doCheck = true;

     

       101
       103

+2 -1

pkgs/development/misc/resholve/resholve.nix

···

       6
       6
        
       , rSrc

     

       7
       7
        
       , version

     

       8
       8
        
       , oildev

     

       9
       9
       +
       , configargparse

     

       9
       10
        
       , binlore

     

       10
       11
        
       , resholve-utils

     

       11
       12
        
       }:

     
···

       19
       20
        
       

     

       20
       21
        
         propagatedBuildInputs = [

     

       21
       22
        
           oildev

     

       22
       22
       -
           python27.pkgs.configargparse

     

       23
       23
       +
           configargparse

     

       23
       24
        
         ];

     

       24
       25
        
       

     

       25
       26
        
         postPatch = ''

+2 -2

pkgs/development/ocaml-modules/carton/default.nix

···

       7
       7
        
       

     

       8
       8
        
       buildDunePackage rec {

     

       9
       9
        
         pname = "carton";

     

       10
       10
       -
         version = "0.4.4";

     

       10
       10
       +
         version = "0.6.0";

     

       11
       11
        
       

     

       12
       12
        
         minimalOCamlVersion = "4.08";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/git-${pname}-v${version}.tbz";

     

       16
       16
       -
           sha256 = "sha256-7mgCgu87Cn4XhjEhonlz9lhgTw0Cu5hnxNJ1wXr+Qhw=";

     

       16
       16
       +
           sha256 = "sha256-NAm4Xq7L0Dgynr8cKZQ356M4GR6D19LbCRxvnSlIf1U=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         # remove changelogs for mimic and the git* packages

+2 -4

pkgs/development/ocaml-modules/carton/git.nix

···

       1
       1
        
       { buildDunePackage, carton, carton-lwt

     

       2
       2
       -
       , bigarray-compat, bigstringaf, lwt, fpath, result

     

       3
       3
       -
       , mmap, fmt, decompress, astring

     

       2
       2
       +
       , bigstringaf, lwt, fpath, result

     

       3
       3
       +
       , fmt, decompress, astring

     

       4
       4
        
       , alcotest, alcotest-lwt, cstruct, logs

     

       5
       5
        
       , mirage-flow, rresult, ke

     

       6
       6
        
       }:

     
···

       13
       13
        
         propagatedBuildInputs = [

     

       14
       14
        
           carton

     

       15
       15
        
           carton-lwt

     

       16
       16
       -
           bigarray-compat

     

       17
       16
        
           bigstringaf

     

       18
       17
        
           lwt

     

       19
       18
        
           fpath

     

       20
       19
        
           result

     

       21
       21
       -
           mmap

     

       22
       20
        
           fmt

     

       23
       21
        
           decompress

     

       24
       22
        
           astring

+2 -4

pkgs/development/ocaml-modules/carton/lwt.nix

···

       1
       1
        
       { buildDunePackage, carton

     

       2
       2
        
       , lwt, decompress, optint, bigstringaf

     

       3
       3
        
       , alcotest, alcotest-lwt, cstruct, fmt, logs

     

       4
       4
       -
       , mirage-flow, result, rresult, bigarray-compat

     

       5
       5
       -
       , ke, base64, bos, checkseum, digestif, fpath, mmap

     

       4
       4
       +
       , mirage-flow, result, rresult

     

       5
       5
       +
       , ke, base64, bos, checkseum, digestif, fpath

     

       6
       6
        
       , stdlib-shims

     

       7
       7
        
       , git-binary # pkgs.git

     

       8
       8
        
       }:

     
···

       31
       31
        
           mirage-flow

     

       32
       32
        
           result

     

       33
       33
        
           rresult

     

       34
       34
       -
           bigarray-compat

     

       35
       34
        
           ke

     

       36
       35
        
           base64

     

       37
       36
        
           bos

     

       38
       37
        
           checkseum

     

       39
       38
        
           digestif

     

       40
       39
        
           fpath

     

       41
       41
       -
           mmap

     

       42
       40
        
           stdlib-shims

     

       43
       41
        
         ];

     

       44
       42

-2

pkgs/development/ocaml-modules/git/paf.nix

···

       13
       13
        
       , rresult

     

       14
       14
        
       , tls

     

       15
       15
        
       , uri

     

       16
       16
       -
       , bigarray-compat

     

       17
       16
        
       , bigstringaf

     

       18
       17
        
       , domain-name

     

       19
       18
        
       , httpaf

     
···

       43
       42
        
           mirage-time

     

       44
       43
        
           tls

     

       45
       44
        
           uri

     

       46
       46
       -
           bigarray-compat

     

       47
       45
        
           bigstringaf

     

       48
       46
        
           domain-name

     

       49
       47
        
           httpaf

+6 -7

pkgs/development/ocaml-modules/otfm/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf, result }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         pname = "otfm";

     

       5
       5
       -
         version = "0.3.0";

     

       5
       5
       +
         version = "0.4.0";

     

       6
       6
        
         webpage = "https://erratique.ch/software/${pname}";

     

       7
       7
        
       in

     

       8
       8
        
       

     

       9
       9
       -
       assert lib.versionAtLeast ocaml.version "4.01.0";

     

       10
       10
       -
       

     

       11
       9
        
       stdenv.mkDerivation {

     

       12
       10
        
       

     

       13
       13
       -
         name = "ocaml-${pname}-${version}";

     

       11
       11
       +
         pname = "ocaml${ocaml.version}-${pname}";

     

       12
       12
       +
         inherit version;

     

       14
       13
        
       

     

       15
       14
        
         src = fetchurl {

     

       16
       15
        
           url = "${webpage}/releases/${pname}-${version}.tbz";

     

       17
       17
       -
           sha256 = "054s82539k3kc9na6s47g3scsl04icjahpas7pv5351jmsgqcq3k";

     

       16
       16
       +
           hash = "sha256-02U23mYTy0ZJgSObDoyygPTGEMC4/Zge5bux4wshaEE=";

     

       18
       17
        
         };

     

       19
       18
        
       

     

       20
       19
        
         nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];

     

       21
       20
        
         buildInputs = [ topkg ];

     

       22
       21
        
       

     

       23
       23
       -
         propagatedBuildInputs = [ uutf result ];

     

       22
       22
       +
         propagatedBuildInputs = [ uutf ];

     

       24
       23
        
       

     

       25
       24
        
         strictDeps = true;

     

       26
       25

+2 -2

pkgs/development/python-modules/acquire/default.nix

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "acquire";

     

       20
       20
       -
         version = "3.2";

     

       20
       20
       +
         version = "3.3";

     

       21
       21
        
         format = "pyproject";

     

       22
       22
        
       

     

       23
       23
        
         disabled = pythonOlder "3.7";

     
···

       26
       26
        
           owner = "fox-it";

     

       27
       27
        
           repo = "acquire";

     

       28
       28
        
           rev = version;

     

       29
       29
       -
           hash = "sha256-YwmrdqWG5qD621+jQMVyTM0Uy0yXCVPv9zfVhZ+ohg0=";

     

       29
       29
       +
           hash = "sha256-S7EZZxNcoLcZyyRNGlZj6nGoCAlqCxNdh3azIVKvOTM=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         SETUPTOOLS_SCM_PRETEND_VERSION = version;

+4 -3

pkgs/development/python-modules/aionanoleaf/default.nix

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "aionanoleaf";

     

       10
       10
       -
         version = "0.2.0";

     

       10
       10
       +
         version = "0.2.1";

     

       11
       11
        
         format = "setuptools";

     

       12
       12
        
       

     

       13
       13
        
         disabled = pythonOlder "3.8";

     
···

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "milanmeu";

     

       17
       17
        
           repo = pname;

     

       18
       18
       -
           rev = "v${version}";

     

       19
       19
       -
           sha256 = "sha256-bz568DlodWtSu2WTTd/QMhdiX9IkllW7UYVXuNlKFaY=";

     

       18
       18
       +
           rev = "refs/tags/v${version}";

     

       19
       19
       +
           hash = "sha256-f0TyXhuAzI0s0n6sXH9mKWA4nad2YchZkQ0+jw/Bmv0=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [

     
···

       33
       33
        
         meta = with lib; {

     

       34
       34
        
           description = "Python wrapper for the Nanoleaf API";

     

       35
       35
        
           homepage = "https://github.com/milanmeu/aionanoleaf";

     

       36
       36
       +
           changelog = "https://github.com/milanmeu/aionanoleaf/releases/tag/v${version}";

     

       36
       37
        
           license = licenses.lgpl3Plus;

     

       37
       38
        
           maintainers = with maintainers; [ fab ];

     

       38
       39
        
         };

+2 -2

pkgs/development/python-modules/aioshelly/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "aioshelly";

     

       12
       12
       -
         version = "5.1.0";

     

       12
       12
       +
         version = "5.1.1";

     

       13
       13
        
         format = "setuptools";

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.9";

     
···

       18
       18
        
           owner = "home-assistant-libs";

     

       19
       19
        
           repo = pname;

     

       20
       20
        
           rev = "refs/tags/${version}";

     

       21
       21
       -
           hash = "sha256-jhoPgwydB/DZx7hC16XgM0UBhmByVZRT5b7BDETA+FY=";

     

       21
       21
       +
           hash = "sha256-6HUykGN0zx97K4372dU1RPncajJt2n20zp2FhrJG1sM=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         propagatedBuildInputs = [

+3 -2

pkgs/development/python-modules/authlib/default.nix

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "authlib";

     

       20
       20
       -
         version = "1.1.0";

     

       20
       20
       +
         version = "1.2.0";

     

       21
       21
        
         format = "setuptools";

     

       22
       22
        
       

     

       23
       23
        
         disabled = pythonOlder "3.7";

     
···

       26
       26
        
           owner = "lepture";

     

       27
       27
        
           repo = "authlib";

     

       28
       28
        
           rev = "refs/tags/v${version}";

     

       29
       29
       -
           hash = "sha256-UTsQRAgmYu4BwT0WWE6XOjTYyGWZIt8bMH9qJ8KLOWA=";

     

       29
       29
       +
           hash = "sha256-OYfvfPnpWE9g7L9cFXUD95B/9+OZy55ZVbmFhFgguUg=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         propagatedBuildInputs = [

     
···

       60
       60
        
         meta = with lib; {

     

       61
       61
        
           description = "Library for building OAuth and OpenID Connect servers";

     

       62
       62
        
           homepage = "https://github.com/lepture/authlib";

     

       63
       63
       +
           changelog = "https://github.com/lepture/authlib/releases/tag/v${version}";

     

       63
       64
        
           license = licenses.bsd3;

     

       64
       65
        
           maintainers = with maintainers; [ flokli ];

     

       65
       66
        
         };

+24

pkgs/development/python-modules/calver/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       }:

     

       5
       5
       +
       let

     

       6
       6
       +
         pname = "calver";

     

       7
       7
       +
         version = "2022.6.26";

     

       8
       8
       +
       

     

       9
       9
       +
       in

     

       10
       10
       +
       buildPythonPackage {

     

       11
       11
       +
         inherit pname version;

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchPypi {

     

       14
       14
       +
           inherit pname version;

     

       15
       15
       +
           hash = "sha256-4FSTo7F1F+8XSPvmENoR8QSF+qfEFrnTP9SlLXSJT4s=";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         meta = {

     

       19
       19
       +
           description = "Setuptools extension for CalVer package versions";

     

       20
       20
       +
           homepage = "https://github.com/di/calver";

     

       21
       21
       +
           license = lib.licenses.asl20;

     

       22
       22
       +
           maintainers = [ ];

     

       23
       23
       +
         };

     

       24
       24
       +
       }

+2 -2

pkgs/development/python-modules/dbus-fast/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "dbus-fast";

     

       14
       14
       -
         version = "1.80.0";

     

       14
       14
       +
         version = "1.82.0";

     

       15
       15
        
         format = "pyproject";

     

       16
       16
        
       

     

       17
       17
        
         disabled = pythonOlder "3.7";

     
···

       20
       20
        
           owner = "Bluetooth-Devices";

     

       21
       21
        
           repo = pname;

     

       22
       22
        
           rev = "v${version}";

     

       23
       23
       -
           hash = "sha256-TeOS4tfJmEQnbHkoRueyTmmIAw2De9w6gWjzD1hlwVI=";

     

       23
       23
       +
           hash = "sha256-mJJElYWTN09zVkx36GqPoILdALAo+fO2JlX4n0dmQ5M=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         nativeBuildInputs = [

+2 -2

pkgs/development/python-modules/django-hijack/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "django-hijack";

     

       12
       12
       -
         version = "3.2.4";

     

       12
       12
       +
         version = "3.2.5";

     

       13
       13
        
       

     

       14
       14
        
         # the wheel comes with pre-built assets, allowing us to avoid fighting

     

       15
       15
        
         # with npm/webpack/gettext to build them ourselves.

     
···

       19
       19
        
           pname = "django_hijack";

     

       20
       20
        
           dist = "py3";

     

       21
       21
        
           python = "py3";

     

       22
       22
       -
           sha256 = "sha256-tSIovIPEszq00Y0PMl/Wlx5YK5MTxLhCpNpHFZDi9rQ=";

     

       22
       22
       +
           sha256 = "sha256-8BHnC3uK6zmSWKfvtDJuTjAKwQlL75G/QwRPgtNJYkE=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [ django django_compat ];

+15 -5

pkgs/development/python-modules/django_classytags/default.nix

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , django

     

       5
       5
       -
       , six

     

       5
       5
       +
       , pythonOlder

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "django-classy-tags";

     

       10
       10
       -
         version = "3.0.1";

     

       10
       10
       +
         version = "4.0.0";

     

       11
       11
       +
         format = "setuptools";

     

       12
       12
       +
       

     

       13
       13
       +
         disabled = pythonOlder "3.7";

     

       11
       14
        
       

     

       12
       15
        
         src = fetchPypi {

     

       13
       16
        
           inherit pname version;

     

       14
       14
       -
           sha256 = "sha256-0iK0VQKsmeVQpWZmeDnvrvlUucc2amST8UOGKqvqyHg=";

     

       17
       17
       +
           hash = "sha256-25/Hxe0I3CYZzEwZsZUUzawT3bYYJ4qwcJTGJtKO7w0=";

     

       15
       18
        
         };

     

       16
       19
        
       

     

       17
       17
       -
         propagatedBuildInputs = [ django six ];

     

       20
       20
       +
         propagatedBuildInputs = [

     

       21
       21
       +
           django

     

       22
       22
       +
         ];

     

       18
       23
        
       

     

       19
       24
        
         # pypi version doesn't include runtest.py, needed to run tests

     

       20
       25
        
         doCheck = false;

     

       21
       26
        
       

     

       27
       27
       +
         pythonImportsCheck = [

     

       28
       28
       +
           "classytags"

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       22
       31
        
         meta = with lib; {

     

       23
       32
        
           description = "Class based template tags for Django";

     

       24
       33
        
           homepage = "https://github.com/divio/django-classy-tags";

     

       34
       34
       +
           changelog = "https://github.com/django-cms/django-classy-tags/blob/${version}/CHANGELOG.rst";

     

       25
       35
        
           license = licenses.bsd3;

     

       36
       36
       +
           maintainers = with maintainers; [ ];

     

       26
       37
        
         };

     

       27
       27
       -
       

     

       28
       38
        
       }

+5 -2

pkgs/development/python-modules/docutils/default.nix

···

       2
       2
        
       , lib

     

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , buildPythonPackage

     

       5
       5
       -
       , isPy3k

     

       6
       5
        
       , python

     

       6
       6
       +
       , pythonOlder

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "docutils";

     

       11
       11
        
         version = "0.19";

     

       12
       12
       +
       

     

       13
       13
       +
         disabled = pythonOlder "3.7";

     

       14
       14
       +
       

     

       12
       15
        
         format = "setuptools";

     

       13
       16
        
       

     

       14
       17
        
         src = fetchPypi {

     
···

       18
       21
        
       

     

       19
       22
        
         # Only Darwin needs LANG, but we could set it in general.

     

       20
       23
        
         # It's done here conditionally to prevent mass-rebuilds.

     

       21
       21
       -
         checkPhase = lib.optionalString (isPy3k && stdenv.isDarwin) ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + ''

     

       24
       24
       +
         checkPhase = lib.optionalString stdenv.isDarwin ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + ''

     

       22
       25
        
           ${python.interpreter} test/alltests.py

     

       23
       26
        
         '';

     

       24
       27

-2

pkgs/development/python-modules/fs/default.nix

···

       5
       5
        
       , setuptools

     

       6
       6
        
       , six

     

       7
       7
        
       , appdirs

     

       8
       8
       -
       , scandir ? null

     

       9
       8
        
       , backports_os ? null

     

       10
       9
        
       , typing ? null

     

       11
       10
        
       , pytz

     
···

       36
       35
        
         propagatedBuildInputs = [ six appdirs pytz setuptools ]

     

       37
       36
        
           ++ lib.optionals (!isPy3k) [ backports_os ]

     

       38
       37
        
           ++ lib.optionals (!pythonAtLeast "3.6") [ typing ]

     

       39
       39
       -
           ++ lib.optionals (!pythonAtLeast "3.5") [ scandir ]

     

       40
       38
        
           ++ lib.optionals (!pythonAtLeast "3.5") [ enum34 ];

     

       41
       39
        
       

     

       42
       40
        
         LC_ALL="en_US.utf-8";

+2 -1

pkgs/development/python-modules/nettigo-air-monitor/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , aiohttp

     

       3
       3
        
       , aioresponses

     

       4
       4
       +
       , aqipy-atmotech

     

       4
       5
        
       , buildPythonPackage

     

       5
       6
        
       , dacite

     

       6
       7
        
       , fetchFromGitHub

     

       7
       7
       -
       , aqipy-atmotech

     

       8
       8
        
       , orjson

     

       9
       9
        
       , pytest-asyncio

     

       10
       10
        
       , pytest-error-for-skips

     
···

       47
       47
        
         meta = with lib; {

     

       48
       48
        
           description = "Python module to get air quality data from Nettigo Air Monitor devices";

     

       49
       49
        
           homepage = "https://github.com/bieniu/nettigo-air-monitor";

     

       50
       50
       +
           changelog = "https://github.com/bieniu/nettigo-air-monitor/releases/tag/${version}";

     

       50
       51
        
           license = with licenses; [ asl20 ];

     

       51
       52
        
           maintainers = with maintainers; [ fab ];

     

       52
       53
        
         };

-32

pkgs/development/python-modules/parameterizedtestcase/default.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , buildPythonPackage

     

       3
       3
       -
       , fetchPypi

     

       4
       4
       -
       , python

     

       5
       5
       -
       , isPy27

     

       6
       6
       -
       }:

     

       7
       7
       -
       

     

       8
       8
       -
       buildPythonPackage rec {

     

       9
       9
       -
         pname = "parameterizedtestcase";

     

       10
       10
       -
         version = "0.1.0";

     

       11
       11
       -
       

     

       12
       12
       -
         src = fetchPypi {

     

       13
       13
       -
           inherit pname version;

     

       14
       14
       -
           sha256 = "4ccc1d15d7e7ef153619a6a9cd45b170268cf82c67fdd336794c75139aae127e";

     

       15
       15
       -
         };

     

       16
       16
       -
       

     

       17
       17
       -
         checkPhase = ''

     

       18
       18
       -
           runHook preCheck

     

       19
       19
       -
           ${python.interpreter} -m parameterizedtestcase.tests

     

       20
       20
       -
           runHook postCheck

     

       21
       21
       -
         '';

     

       22
       22
       -
       

     

       23
       23
       -
         doCheck = isPy27;

     

       24
       24
       -
       

     

       25
       25
       -
         meta = with lib; {

     

       26
       26
       -
           description = "Parameterized tests for Python's unittest module";

     

       27
       27
       -
           homepage = "https://github.com/msabramo/python_unittest_parameterized_test_case";

     

       28
       28
       -
           license = licenses.mit;

     

       29
       29
       -
           maintainers = with maintainers; [ dotlambda ];

     

       30
       30
       -
           broken = python.isPy3k; # uses use_2to3

     

       31
       31
       -
         };

     

       32
       32
       -
       }

+1 -2

pkgs/development/python-modules/pathlib2/default.nix

···

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , six

     

       5
       5
        
       , pythonOlder

     

       6
       6
       -
       , scandir ? null

     

       7
       6
        
       , glibcLocales

     

       8
       7
        
       , mock

     

       9
       8
        
       , typing

     
···

       19
       18
        
         };

     

       20
       19
        
       

     

       21
       20
        
         propagatedBuildInputs = [ six ]

     

       22
       22
       -
           ++ lib.optionals (pythonOlder "3.5") [ scandir typing ];

     

       21
       21
       +
           ++ lib.optionals (pythonOlder "3.5") [ typing ];

     

       23
       22
        
         checkInputs = [ glibcLocales ]

     

       24
       23
        
           ++ lib.optional (pythonOlder "3.3") mock;

     

       25
       24

-47

pkgs/development/python-modules/pygobject/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, fetchpatch, python, buildPythonPackage, pkg-config, glib, isPy3k, pythonAtLeast }:

     

       2
       2
       -
       

     

       3
       3
       -
       buildPythonPackage rec {

     

       4
       4
       -
         pname = "pygobject";

     

       5
       5
       -
         version = "2.28.7";

     

       6
       6
       -
         format = "other";

     

       7
       7
       -
         disabled = pythonAtLeast "3.9";

     

       8
       8
       -
       

     

       9
       9
       -
         src = fetchurl {

     

       10
       10
       -
           url = "mirror://gnome/sources/pygobject/2.28/${pname}-${version}.tar.xz";

     

       11
       11
       -
           sha256 = "0nkam61rsn7y3wik3vw46wk5q2cjfh2iph57hl9m39rc8jijb7dv";

     

       12
       12
       -
         };

     

       13
       13
       -
       

     

       14
       14
       -
         outputs = [ "out" "devdoc" ];

     

       15
       15
       -
       

     

       16
       16
       -
         patches = lib.optionals stdenv.isDarwin [

     

       17
       17
       -
           ./pygobject-2.0-fix-darwin.patch

     

       18
       18
       -
           (fetchpatch {

     

       19
       19
       -
             url = "https://github.com/macports/macports-ports/raw/f2975d5bbbc2459c661905c5a850cc661fa32f55/python/py-gobject/files/py-gobject-dynamic_lookup-11.patch";

     

       20
       20
       -
             sha256 = "sha256-mtlyu+La3+iC5iQAmVJzDA5E35XGaRQy/EKXzvrWRCg=";

     

       21
       21
       -
             extraPrefix = "";

     

       22
       22
       -
           })

     

       23
       23
       -
         ];

     

       24
       24
       -
       

     

       25
       25
       -
         configureFlags = [ "--disable-introspection" ];

     

       26
       26
       -
       

     

       27
       27
       -
         nativeBuildInputs = [ pkg-config ];

     

       28
       28
       -
         buildInputs = [ glib ];

     

       29
       29
       -
       

     

       30
       30
       -
         # in a "normal" setup, pygobject and pygtk are installed into the

     

       31
       31
       -
         # same site-packages: we need a pth file for both. pygtk.py would be

     

       32
       32
       -
         # used to select a specific version, in our setup it should have no

     

       33
       33
       -
         # effect, but we leave it in case somebody expects and calls it.

     

       34
       34
       -
         postInstall = lib.optionalString (!isPy3k) ''

     

       35
       35
       -
           mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${pname}-${version}.pth}

     

       36
       36
       -
       

     

       37
       37
       -
           # Prevent wrapping of codegen files as these are meant to be

     

       38
       38
       -
           # executed by the python program

     

       39
       39
       -
           chmod a-x $out/share/pygobject/*/codegen/*.py

     

       40
       40
       -
         '';

     

       41
       41
       -
       

     

       42
       42
       -
         meta = with lib; {

     

       43
       43
       -
           homepage = "https://pygobject.readthedocs.io/";

     

       44
       44
       -
           description = "Python bindings for GLib";

     

       45
       45
       -
           platforms = platforms.unix;

     

       46
       46
       -
         };

     

       47
       47
       -
       }

pkgs/development/python-modules/pygobject/pygobject-2.0-fix-darwin.patch pkgs/development/python2-modules/pygobject/pygobject-2.0-fix-darwin.patch

+2 -2

pkgs/development/python-modules/pyswitchbot/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "pyswitchbot";

     

       12
       12
       -
         version = "0.22.0";

     

       12
       12
       +
         version = "0.23.1";

     

       13
       13
        
         format = "setuptools";

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.7";

     
···

       18
       18
        
           owner = "Danielhiversen";

     

       19
       19
        
           repo = "pySwitchbot";

     

       20
       20
        
           rev = "refs/tags/${version}";

     

       21
       21
       -
           hash = "sha256-/FECjJ/iVx4CTtOgxpPBF0lZCctghmD4qUrQQYwmAkQ=";

     

       21
       21
       +
           hash = "sha256-vBXOZ+AhhqWUD6XukmkHF4wjjJxXbK7r0V+qCuZGc6s=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         propagatedBuildInputs = [

+3 -2

pkgs/development/python-modules/python-fsutil/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "python-fsutil";

     

       11
       11
       -
         version = "0.7.0";

     

       11
       11
       +
         version = "0.8.0";

     

       12
       12
        
         format = "setuptools";

     

       13
       13
        
       

     

       14
       14
        
         disabled = pythonOlder "3.7";

     
···

       17
       17
        
           owner = "fabiocaccamo";

     

       18
       18
        
           repo = pname;

     

       19
       19
        
           rev = "refs/tags/${version}";

     

       20
       20
       -
           hash = "sha256-2T2C2bIOAdxppZxqI+QGE2R/+46LoqB7eNdlt4sVAd8=";

     

       20
       20
       +
           hash = "sha256-J5B5THfB/yPG1JSCpO2HTHTH0jn0nbKFzXpZMGJ/dKA=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = [

     
···

       45
       45
        
         meta = with lib; {

     

       46
       46
        
           description = "Module with file-system utilities";

     

       47
       47
        
           homepage = "https://github.com/fabiocaccamo/python-fsutil";

     

       48
       48
       +
           changelog = "https://github.com/fabiocaccamo/python-fsutil/blob/${version}/CHANGELOG.md";

     

       48
       49
        
           license = licenses.mit;

     

       49
       50
        
           maintainers = with maintainers; [ fab ];

     

       50
       51
        
         };

+2 -2

pkgs/development/python-modules/teslajsonpy/default.nix

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "teslajsonpy";

     

       18
       18
       -
         version = "3.4.1";

     

       18
       18
       +
         version = "3.5.0";

     

       19
       19
        
         format = "pyproject";

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.7";

     
···

       24
       24
        
           owner = "zabuldon";

     

       25
       25
        
           repo = pname;

     

       26
       26
        
           rev = "refs/tags/v${version}";

     

       27
       27
       -
           hash = "sha256-RPCzxcuD57ma306GLYsxxvvvZ0e8RTd/KxOeMSaQQQQ=";

     

       27
       27
       +
           hash = "sha256-mjKbCy4WalB3kRk1x6bTBLARCW0vrUbSdcvvDP//TzM=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         nativeBuildInputs = [

+2 -2

pkgs/development/python-modules/types-setuptools/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "types-setuptools";

     

       8
       8
       -
         version = "65.6.0.0";

     

       8
       8
       +
         version = "65.6.0.2";

     

       9
       9
        
         format = "setuptools";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "sha256-MnC+rbmbxvpLmlzDUQbnFEpcMwKM5ImSsQ50rcjMXII=";

     

       13
       13
       +
           sha256 = "sha256-rWDM8B1ibel2IiREjzbBPgZg6GOv1twR2Xmzc5psfSQ=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         # Module doesn't have tests

-37

pkgs/development/python2-modules/Pygments/default.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , buildPythonPackage

     

       3
       3
       -
       , fetchPypi

     

       4
       4
       -
       , fetchpatch

     

       5
       5
       -
       , docutils

     

       6
       6
       -
       }:

     

       7
       7
       -
       

     

       8
       8
       -
       buildPythonPackage rec {

     

       9
       9
       -
         pname = "Pygments";

     

       10
       10
       -
         version = "2.5.2";

     

       11
       11
       -
       

     

       12
       12
       -
         src = fetchPypi {

     

       13
       13
       -
           inherit pname version;

     

       14
       14
       -
           sha256 = "98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe";

     

       15
       15
       -
         };

     

       16
       16
       -
       

     

       17
       17
       -
         patches = [

     

       18
       18
       -
           (fetchpatch {

     

       19
       19
       -
             name = "CVE-2021-27291.patch";

     

       20
       20
       -
             url = "https://github.com/pygments/pygments/commit/2e7e8c4a7b318f4032493773732754e418279a14.patch";

     

       21
       21
       -
             sha256 = "0ap7jgkmvkkzijabsgnfrwl376cjsxa4jmzvqysrkwpjq3q4rxpa";

     

       22
       22
       -
             excludes = ["CHANGES"];

     

       23
       23
       -
           })

     

       24
       24
       -
         ];

     

       25
       25
       -
       

     

       26
       26
       -
         propagatedBuildInputs = [ docutils ];

     

       27
       27
       -
       

     

       28
       28
       -
         # Circular dependency with sphinx

     

       29
       29
       -
         doCheck = false;

     

       30
       30
       -
       

     

       31
       31
       -
         meta = {

     

       32
       32
       -
           homepage = "https://pygments.org/";

     

       33
       33
       -
           description = "A generic syntax highlighter";

     

       34
       34
       -
           license = lib.licenses.bsd2;

     

       35
       35
       -
           maintainers = with lib.maintainers; [ ];

     

       36
       36
       -
         };

     

       37
       37
       -
       }

-50

pkgs/development/python2-modules/boto3/default.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , buildPythonPackage

     

       3
       3
       -
       , fetchPypi

     

       4
       4
       -
       , botocore

     

       5
       5
       -
       , jmespath

     

       6
       6
       -
       , s3transfer

     

       7
       7
       -
       , futures ? null

     

       8
       8
       -
       , docutils

     

       9
       9
       -
       , nose

     

       10
       10
       -
       , mock

     

       11
       11
       -
       , isPy3k

     

       12
       12
       -
       }:

     

       13
       13
       -
       

     

       14
       14
       -
       buildPythonPackage rec {

     

       15
       15
       -
         pname = "boto3";

     

       16
       16
       -
         version = "1.17.97"; # N.B: if you change this, change botocore and awscli to a matching version

     

       17
       17
       -
       

     

       18
       18
       -
         src = fetchPypi {

     

       19
       19
       -
           inherit pname version;

     

       20
       20
       -
           sha256 = "0ab5afc51461c30f27aebef944211d16f47697b98ff8d2e2f6e49e59584853bb";

     

       21
       21
       -
         };

     

       22
       22
       -
       

     

       23
       23
       -
         propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

     

       24
       24
       -
         checkInputs = [ docutils nose mock ];

     

       25
       25
       -
       

     

       26
       26
       -
         checkPhase = ''

     

       27
       27
       -
           runHook preCheck

     

       28
       28
       -
           # This method is not in mock. It might have appeared in some versions.

     

       29
       29
       -
           sed -i 's/action.assert_called_once()/self.assertEqual(action.call_count, 1)/' \

     

       30
       30
       -
             tests/unit/resources/test_factory.py

     

       31
       31
       -
           nosetests -d tests/unit --verbose

     

       32
       32
       -
           runHook postCheck

     

       33
       33
       -
         '';

     

       34
       34
       -
       

     

       35
       35
       -
         # Network access

     

       36
       36
       -
         doCheck = false;

     

       37
       37
       -
       

     

       38
       38
       -
         pythonImportsCheck = [ "boto3" ];

     

       39
       39
       -
       

     

       40
       40
       -
         meta = {

     

       41
       41
       -
           homepage = "https://github.com/boto/boto3";

     

       42
       42
       -
           license = lib.licenses.asl20;

     

       43
       43
       -
           description = "AWS SDK for Python";

     

       44
       44
       -
           longDescription = ''

     

       45
       45
       -
             Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for

     

       46
       46
       -
             Python, which allows Python developers to write software that makes use of

     

       47
       47
       -
             services like Amazon S3 and Amazon EC2.

     

       48
       48
       -
           '';

     

       49
       49
       -
         };

     

       50
       50
       -
       }

-46

pkgs/development/python2-modules/botocore/default.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , buildPythonPackage

     

       3
       3
       -
       , fetchPypi

     

       4
       4
       -
       , python-dateutil

     

       5
       5
       -
       , jmespath

     

       6
       6
       -
       , docutils

     

       7
       7
       -
       , simplejson

     

       8
       8
       -
       , mock

     

       9
       9
       -
       , nose

     

       10
       10
       -
       , urllib3

     

       11
       11
       -
       }:

     

       12
       12
       -
       

     

       13
       13
       -
       buildPythonPackage rec {

     

       14
       14
       -
         pname = "botocore";

     

       15
       15
       -
         version = "1.20.97"; # N.B: if you change this, change boto3 and awscli to a matching version

     

       16
       16
       -
       

     

       17
       17
       -
         src = fetchPypi {

     

       18
       18
       -
           inherit pname version;

     

       19
       19
       -
           sha256 = "f7e119cf3e0f4a36100f0e983583afa91a84fb27c479a1716820aee4f2e190ab";

     

       20
       20
       -
         };

     

       21
       21
       -
       

     

       22
       22
       -
         propagatedBuildInputs = [

     

       23
       23
       -
           python-dateutil

     

       24
       24
       -
           jmespath

     

       25
       25
       -
           docutils

     

       26
       26
       -
           simplejson

     

       27
       27
       -
           urllib3

     

       28
       28
       -
         ];

     

       29
       29
       -
       

     

       30
       30
       -
         checkInputs = [ mock nose ];

     

       31
       31
       -
       

     

       32
       32
       -
         checkPhase = ''

     

       33
       33
       -
           nosetests -v

     

       34
       34
       -
         '';

     

       35
       35
       -
       

     

       36
       36
       -
         # Network access

     

       37
       37
       -
         doCheck = false;

     

       38
       38
       -
       

     

       39
       39
       -
         pythonImportsCheck = [ "botocore" ];

     

       40
       40
       -
       

     

       41
       41
       -
         meta = with lib; {

     

       42
       42
       -
           homepage = "https://github.com/boto/botocore";

     

       43
       43
       -
           license = licenses.asl20;

     

       44
       44
       -
           description = "A low-level interface to a growing number of Amazon Web Services";

     

       45
       45
       -
         };

     

       46
       46
       -
       }

-34

pkgs/development/python2-modules/certifi/default.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , fetchPypi

     

       3
       3
       -
       , buildPythonPackage

     

       4
       4
       -
       , python3

     

       5
       5
       -
       }:

     

       6
       6
       -
       

     

       7
       7
       -
       let

     

       8
       8
       -
         inherit (python3.pkgs) certifi;

     

       9
       9
       -
       

     

       10
       10
       -
       in buildPythonPackage rec {

     

       11
       11
       -
         pname = "certifi";

     

       12
       12
       -
         version = "2019.11.28";

     

       13
       13
       -
       

     

       14
       14
       -
         src = fetchPypi {

     

       15
       15
       -
           inherit pname version;

     

       16
       16
       -
           sha256 = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f";

     

       17
       17
       -
         };

     

       18
       18
       -
       

     

       19
       19
       -
         postPatch = ''

     

       20
       20
       -
           cp ${certifi.src}/certifi/cacert.pem certifi/cacert.pem

     

       21
       21
       -
         '';

     

       22
       22
       -
       

     

       23
       23
       -
         pythonImportsCheck = [ "certifi" ];

     

       24
       24
       -
       

     

       25
       25
       -
         # no tests implemented

     

       26
       26
       -
         doCheck = false;

     

       27
       27
       -
       

     

       28
       28
       -
         meta = with lib; {

     

       29
       29
       -
           homepage = "https://github.com/certifi/python-certifi";

     

       30
       30
       -
           description = "Python package for providing Mozilla's CA Bundle";

     

       31
       31
       -
           license = licenses.isc;

     

       32
       32
       -
           maintainers = with maintainers; [ ]; # NixOps team

     

       33
       33
       -
         };

     

       34
       34
       -
       }

-29

pkgs/development/python2-modules/chardet/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, fetchpatch

     

       2
       2
       -
       , pytest, pytest-runner, hypothesis }:

     

       3
       3
       -
       

     

       4
       4
       -
       buildPythonPackage rec {

     

       5
       5
       -
         pname = "chardet";

     

       6
       6
       -
         version = "3.0.4";

     

       7
       7
       -
       

     

       8
       8
       -
         src = fetchPypi {

     

       9
       9
       -
           inherit pname version;

     

       10
       10
       -
           sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4";

     

       11
       11
       -
         };

     

       12
       12
       -
       

     

       13
       13
       -
         patches = [

     

       14
       14
       -
           # Add pytest 4 support. See: https://github.com/chardet/chardet/pull/174

     

       15
       15
       -
           (fetchpatch {

     

       16
       16
       -
             url = "https://github.com/chardet/chardet/commit/0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4.patch";

     

       17
       17
       -
             sha256 = "1y1xhjf32rdhq9sfz58pghwv794f3w2f2qcn8p6hp4pc8jsdrn2q";

     

       18
       18
       -
           })

     

       19
       19
       -
         ];

     

       20
       20
       -
       

     

       21
       21
       -
         checkInputs = [ pytest pytest-runner hypothesis ];

     

       22
       22
       -
       

     

       23
       23
       -
         meta = with lib; {

     

       24
       24
       -
           homepage = "https://github.com/chardet/chardet";

     

       25
       25
       -
           description = "Universal encoding detector";

     

       26
       26
       -
           license = licenses.lgpl2;

     

       27
       27
       -
           maintainers = with maintainers; [ domenkozar ];

     

       28
       28
       -
         };

     

       29
       29
       -
       }

-41

pkgs/development/python2-modules/google-apputils/default.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , buildPythonPackage

     

       3
       3
       -
       , fetchPypi

     

       4
       4
       -
       , isPy3k

     

       5
       5
       -
       , pytz

     

       6
       6
       -
       , gflags

     

       7
       7
       -
       , python-dateutil

     

       8
       8
       -
       , mox

     

       9
       9
       -
       , python

     

       10
       10
       -
       }:

     

       11
       11
       -
       

     

       12
       12
       -
       buildPythonPackage rec {

     

       13
       13
       -
         pname = "google-apputils";

     

       14
       14
       -
         version = "0.4.2";

     

       15
       15
       -
         disabled = isPy3k;

     

       16
       16
       -
       

     

       17
       17
       -
         src = fetchPypi {

     

       18
       18
       -
           inherit pname version;

     

       19
       19
       -
           sha256 = "0afw0gxmh0yw5g7xsmw49gs8bbp0zyhbh6fr1b0h48f3a439v5a7";

     

       20
       20
       -
         };

     

       21
       21
       -
       

     

       22
       22
       -
         preConfigure = ''

     

       23
       23
       -
           sed -i '/ez_setup/d' setup.py

     

       24
       24
       -
         '';

     

       25
       25
       -
       

     

       26
       26
       -
         propagatedBuildInputs = [ pytz gflags python-dateutil mox ];

     

       27
       27
       -
       

     

       28
       28
       -
         checkPhase = ''

     

       29
       29
       -
           ${python.executable} setup.py google_test

     

       30
       30
       -
         '';

     

       31
       31
       -
       

     

       32
       32
       -
         # ERROR:root:Trying to access flag test_tmpdir before flags were parsed.

     

       33
       33
       -
         doCheck = false;

     

       34
       34
       -
       

     

       35
       35
       -
         meta = with lib; {

     

       36
       36
       -
           description = "Google Application Utilities for Python";

     

       37
       37
       -
           homepage = "https://github.com/google/google-apputils";

     

       38
       38
       -
           license = licenses.asl20;

     

       39
       39
       -
           maintainers = with maintainers; [ SuperSandro2000 ];

     

       40
       40
       -
         };

     

       41
       41
       -
       }

-36

pkgs/development/python2-modules/gtkme/default.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , buildPythonPackage

     

       3
       3
       -
       , fetchPypi

     

       4
       4
       -
       , pkg-config

     

       5
       5
       -
       , gobject-introspection

     

       6
       6
       -
       , pygobject3

     

       7
       7
       -
       , gtk3

     

       8
       8
       -
       , glib

     

       9
       9
       -
       }:

     

       10
       10
       -
       

     

       11
       11
       -
       buildPythonPackage rec {

     

       12
       12
       -
         pname = "gtkme";

     

       13
       13
       -
         version = "1.5.3";

     

       14
       14
       -
       

     

       15
       15
       -
         src = fetchPypi {

     

       16
       16
       -
           inherit pname version;

     

       17
       17
       -
           sha256 = "sha256-NIUgnbfcHjbPfsH3CF2Bywo8owrdsi1wqDoMxOa+2U4=";

     

       18
       18
       -
         };

     

       19
       19
       -
       

     

       20
       20
       -
         nativeBuildInputs = [ pkg-config gobject-introspection gtk3 ];

     

       21
       21
       -
         buildInputs = [ pygobject3 glib ];

     

       22
       22
       -
         propagatedBuildInputs = [ gtk3 ];

     

       23
       23
       -
       

     

       24
       24
       -
         pythonImportsCheck = [

     

       25
       25
       -
           "gtkme"

     

       26
       26
       -
         ];

     

       27
       27
       -
       

     

       28
       28
       -
         meta = with lib; {

     

       29
       29
       -
           description = "Manages an Application with Gtk windows, forms, lists and other complex items easily";

     

       30
       30
       -
           homepage = "https://gitlab.com/doctormo/gtkme";

     

       31
       31
       -
           license = licenses.gpl3Plus;

     

       32
       32
       -
           maintainers = with maintainers; [

     

       33
       33
       -
             revol-xut

     

       34
       34
       -
           ];

     

       35
       35
       -
         };

     

       36
       36
       -
       }

-23

pkgs/development/python2-modules/idna/default.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , buildPythonPackage

     

       3
       3
       -
       , fetchPypi

     

       4
       4
       -
       , pytestCheckHook

     

       5
       5
       -
       }:

     

       6
       6
       -
       

     

       7
       7
       -
       buildPythonPackage rec {

     

       8
       8
       -
         pname = "idna";

     

       9
       9
       -
         version = "2.10";

     

       10
       10
       -
       

     

       11
       11
       -
         src = fetchPypi {

     

       12
       12
       -
           inherit pname version;

     

       13
       13
       -
           sha256 = "b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6";

     

       14
       14
       -
         };

     

       15
       15
       -
       

     

       16
       16
       -
         checkInputs = [ pytestCheckHook ];

     

       17
       17
       -
       

     

       18
       18
       -
         meta = {

     

       19
       19
       -
           homepage = "https://github.com/kjd/idna/";

     

       20
       20
       -
           description = "Internationalized Domain Names in Applications (IDNA)";

     

       21
       21
       -
           license = lib.licenses.bsd3;

     

       22
       22
       -
         };

     

       23
       23
       -
       }

-29

pkgs/development/python2-modules/marisa/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchFromGitHub, marisa, swig

     

       2
       2
       -
       , isPy3k

     

       3
       3
       -
       }:

     

       4
       4
       -
       

     

       5
       5
       -
       buildPythonPackage rec {

     

       6
       6
       -
         pname = "marisa";

     

       7
       7
       -
         version = "1.3.40";

     

       8
       8
       -
       

     

       9
       9
       -
         disabled = isPy3k;

     

       10
       10
       -
       

     

       11
       11
       -
         src = fetchFromGitHub {

     

       12
       12
       -
           owner = "s-yata";

     

       13
       13
       -
           repo  = "marisa-trie";

     

       14
       14
       -
           rev   = "8dba9850b89d7828ebf33b8ab84df2b54d31260b";

     

       15
       15
       -
           sha256 = "0pkp9fggk53lxlicfwrskgx33qplc4v6njbavlnz4x4z63zd4933";

     

       16
       16
       -
         };

     

       17
       17
       -
       

     

       18
       18
       -
         nativeBuildInputs = [ swig marisa ];

     

       19
       19
       -
         buildInputs = [ marisa ];

     

       20
       20
       -
       

     

       21
       21
       -
         sourceRoot = "${src.name}/bindings/python";

     

       22
       22
       -
       

     

       23
       23
       -
         meta = with lib; {

     

       24
       24
       -
           description = "Python binding for marisa package (do not confuse with marisa-trie python bindings)";

     

       25
       25
       -
           homepage    = "https://github.com/s-yata/marisa-trie";

     

       26
       26
       -
           license     = with licenses; [ bsd2 lgpl2 ];

     

       27
       27
       -
           maintainers = with maintainers; [ vanzef ];

     

       28
       28
       -
         };

     

       29
       29
       -
       }

-59

pkgs/development/python2-modules/protobuf/default.nix

···

       1
       1
       -
       { buildPackages

     

       2
       2
       -
       , lib

     

       3
       3
       -
       , fetchpatch

     

       4
       4
       -
       , python

     

       5
       5
       -
       , buildPythonPackage

     

       6
       6
       -
       , isPy37

     

       7
       7
       -
       , protobuf

     

       8
       8
       -
       , google-apputils ? null

     

       9
       9
       -
       , six

     

       10
       10
       -
       , pyext

     

       11
       11
       -
       , isPy27

     

       12
       12
       -
       , disabled

     

       13
       13
       -
       , doCheck ? true

     

       14
       14
       -
       }:

     

       15
       15
       -
       

     

       16
       16
       -
       buildPythonPackage {

     

       17
       17
       -
         inherit (protobuf) pname src version;

     

       18
       18
       -
         inherit disabled;

     

       19
       19
       -
         doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2

     

       20
       20
       -
       

     

       21
       21
       -
         propagatedBuildInputs = [ six ] ++ lib.optionals isPy27 [ google-apputils ];

     

       22
       22
       -
         propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc.

     

       23
       23
       -
         nativeBuildInputs = [ pyext ] ++ lib.optionals isPy27 [ google-apputils ];

     

       24
       24
       -
         buildInputs = [ protobuf ];

     

       25
       25
       -
       

     

       26
       26
       -
         patches = lib.optional (isPy37 && (lib.versionOlder protobuf.version "3.6.1.2"))

     

       27
       27
       -
           # Python 3.7 compatibility (not needed for protobuf >= 3.6.1.2)

     

       28
       28
       -
           (fetchpatch {

     

       29
       29
       -
             url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch";

     

       30
       30
       -
             sha256 = "09hw22y3423v8bbmc9xm07znwdxfbya6rp78d4zqw6fisdvjkqf1";

     

       31
       31
       -
             stripLen = 1;

     

       32
       32
       -
           })

     

       33
       33
       -
         ;

     

       34
       34
       -
       

     

       35
       35
       -
         prePatch = ''

     

       36
       36
       -
           while [ ! -d python ]; do

     

       37
       37
       -
             cd *

     

       38
       38
       -
           done

     

       39
       39
       -
           cd python

     

       40
       40
       -
         '';

     

       41
       41
       -
       

     

       42
       42
       -
         setupPyGlobalFlags = lib.optional (lib.versionAtLeast protobuf.version "2.6.0")

     

       43
       43
       -
           "--cpp_implementation";

     

       44
       44
       -
       

     

       45
       45
       -
         pythonImportsCheck = [

     

       46
       46
       -
           "google.protobuf"

     

       47
       47
       -
         ] ++ lib.optionals (lib.versionAtLeast protobuf.version "2.6.0") [

     

       48
       48
       -
           "google.protobuf.internal._api_implementation" # Verify that --cpp_implementation worked

     

       49
       49
       -
         ];

     

       50
       50
       -
       

     

       51
       51
       -
         meta = with lib; {

     

       52
       52
       -
           description = "Protocol Buffers are Google's data interchange format";

     

       53
       53
       -
           homepage = "https://developers.google.com/protocol-buffers/";

     

       54
       54
       -
           license = licenses.bsd3;

     

       55
       55
       -
           maintainers = with maintainers; [ knedlsepp ];

     

       56
       56
       -
         };

     

       57
       57
       -
       

     

       58
       58
       -
         passthru.protobuf = protobuf;

     

       59
       59
       -
       }

+31 -16

pkgs/development/python2-modules/pygobject/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection,

     

       2
       2
       -
       pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, fetchpatch, python, buildPythonPackage, pkg-config, glib, isPy3k, pythonAtLeast }:

     

       3
       2
        
       

     

       4
       3
        
       buildPythonPackage rec {

     

       5
       4
        
         pname = "pygobject";

     

       6
       6
       -
         version = "3.36.1";

     

       7
       7
       -
       

     

       5
       5
       +
         version = "2.28.7";

     

       8
       6
        
         format = "other";

     

       7
       7
       +
         disabled = pythonAtLeast "3.9";

     

       9
       8
        
       

     

       10
       9
        
         src = fetchurl {

     

       11
       11
       -
           url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

     

       12
       12
       -
           sha256 = "0b9CgC0c7BE7Wtqg579/N0W0RSHcIWNYjSdtXNYdcY8=";

     

       10
       10
       +
           url = "mirror://gnome/sources/pygobject/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

     

       11
       11
       +
           sha256 = "0nkam61rsn7y3wik3vw46wk5q2cjfh2iph57hl9m39rc8jijb7dv";

     

       13
       12
        
         };

     

       14
       13
        
       

     

       15
       15
       -
         outputs = [ "out" "dev" ];

     

       14
       14
       +
         outputs = [ "out" "devdoc" ];

     

       16
       15
        
       

     

       17
       17
       -
         mesonFlags = [

     

       18
       18
       -
           "-Dpython=python${if isPy3k then "3" else "2" }"

     

       16
       16
       +
         patches = lib.optionals stdenv.isDarwin [

     

       17
       17
       +
           ./pygobject-2.0-fix-darwin.patch

     

       18
       18
       +
           (fetchpatch {

     

       19
       19
       +
             url = "https://github.com/macports/macports-ports/raw/f2975d5bbbc2459c661905c5a850cc661fa32f55/python/py-gobject/files/py-gobject-dynamic_lookup-11.patch";

     

       20
       20
       +
             sha256 = "sha256-mtlyu+La3+iC5iQAmVJzDA5E35XGaRQy/EKXzvrWRCg=";

     

       21
       21
       +
             extraPrefix = "";

     

       22
       22
       +
           })

     

       19
       23
        
         ];

     

       20
       24
        
       

     

       21
       21
       -
         nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ];

     

       22
       22
       -
         buildInputs = [ glib gobject-introspection ]

     

       23
       23
       -
                        ++ lib.optionals stdenv.isDarwin [ which ncurses ];

     

       24
       24
       -
         propagatedBuildInputs = [ pycairo cairo ];

     

       25
       25
       +
         configureFlags = [ "--disable-introspection" ];

     

       26
       26
       +
       

     

       27
       27
       +
         nativeBuildInputs = [ pkg-config ];

     

       28
       28
       +
         buildInputs = [ glib ];

     

       29
       29
       +
       

     

       30
       30
       +
         # in a "normal" setup, pygobject and pygtk are installed into the

     

       31
       31
       +
         # same site-packages: we need a pth file for both. pygtk.py would be

     

       32
       32
       +
         # used to select a specific version, in our setup it should have no

     

       33
       33
       +
         # effect, but we leave it in case somebody expects and calls it.

     

       34
       34
       +
         postInstall = lib.optionalString (!isPy3k) ''

     

       35
       35
       +
           mv $out/${python.sitePackages}/{pygtk.pth,${pname}-${version}.pth}

     

       36
       36
       +
       

     

       37
       37
       +
           # Prevent wrapping of codegen files as these are meant to be

     

       38
       38
       +
           # executed by the python program

     

       39
       39
       +
           chmod a-x $out/share/pygobject/*/codegen/*.py

     

       40
       40
       +
         '';

     

       25
       41
        
       

     

       26
       42
        
         meta = with lib; {

     

       27
       43
        
           homepage = "https://pygobject.readthedocs.io/";

     

       28
       28
       -
           description = "Python bindings for Glib";

     

       44
       44
       +
           description = "Python bindings for GLib";

     

       29
       45
        
           license = licenses.gpl2;

     

       30
       30
       -
           maintainers = with maintainers; [ orivej ];

     

       31
       31
       -
           platforms = platforms.unix;

     

       46
       46
       +
           maintainers = with maintainers; [ ];

     

       32
       47
        
         };

     

       33
       48
        
       }

-26

pkgs/development/python2-modules/pyroma/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , docutils, pygments, setuptools

     

       3
       3
       -
       }:

     

       4
       4
       -
       

     

       5
       5
       -
       buildPythonPackage rec {

     

       6
       6
       -
         pname = "pyroma";

     

       7
       7
       -
         version = "2.6.1";

     

       8
       8
       -
       

     

       9
       9
       -
         src = fetchPypi {

     

       10
       10
       -
           inherit pname version;

     

       11
       11
       -
           sha256 = "2527423e3a24ccd56951f3ce1b0ebbcc4fa0518c82fca882e696c78726ab9c2f";

     

       12
       12
       -
         };

     

       13
       13
       -
       

     

       14
       14
       -
         postPatch = ''

     

       15
       15
       -
           substituteInPlace setup.py \

     

       16
       16
       -
             --replace "pygments < 2.6" "pygments"

     

       17
       17
       -
         '';

     

       18
       18
       -
       

     

       19
       19
       -
         propagatedBuildInputs = [ docutils pygments setuptools ];

     

       20
       20
       -
       

     

       21
       21
       -
         meta = with lib; {

     

       22
       22
       -
           description = "Test your project's packaging friendliness";

     

       23
       23
       -
           homepage = "https://github.com/regebro/pyroma";

     

       24
       24
       -
           license = licenses.mit;

     

       25
       25
       -
         };

     

       26
       26
       -
       }

-57

pkgs/development/python2-modules/pysqlite/default.nix

···

       1
       1
       -
       { lib, stdenv

     

       2
       2
       -
       , buildPythonPackage

     

       3
       3
       -
       , fetchPypi

     

       4
       4
       -
       , isPy3k

     

       5
       5
       -
       , pkgs

     

       6
       6
       -
       }:

     

       7
       7
       -
       

     

       8
       8
       -
       buildPythonPackage rec {

     

       9
       9
       -
         pname = "pysqlite";

     

       10
       10
       -
         version = "2.8.3";

     

       11
       11
       -
       

     

       12
       12
       -
         src = fetchPypi {

     

       13
       13
       -
           inherit pname version;

     

       14
       14
       -
           sha256 = "17d3335863e8cf8392eea71add33dab3f96d060666fe68ab7382469d307f4490";

     

       15
       15
       -
         };

     

       16
       16
       -
       

     

       17
       17
       -
         # Need to use the builtin sqlite3 on Python 3

     

       18
       18
       -
         disabled = isPy3k;

     

       19
       19
       -
       

     

       20
       20
       -
         # Since the `.egg' file is zipped, the `NEEDED' of the `.so' files

     

       21
       21
       -
         # it contains is not taken into account.  Thus, we must explicitly make

     

       22
       22
       -
         # it a propagated input.

     

       23
       23
       -
         propagatedBuildInputs = [ pkgs.sqlite ];

     

       24
       24
       -
       

     

       25
       25
       -
         patchPhase = ''

     

       26
       26
       -
           substituteInPlace "setup.cfg"                                     \

     

       27
       27
       -
                   --replace "/usr/local/include" "${pkgs.sqlite.dev}/include"   \

     

       28
       28
       -
                   --replace "/usr/local/lib" "${pkgs.sqlite.out}/lib"

     

       29
       29
       -
           ${lib.optionalString (!stdenv.isDarwin) ''export LDSHARED="$CC -pthread -shared"''}

     

       30
       30
       -
         '';

     

       31
       31
       -
       

     

       32
       32
       -
         meta = with lib; {

     

       33
       33
       -
           homepage = "https://pysqlite.org/";

     

       34
       34
       -
           description = "Python bindings for the SQLite embedded relational database engine";

     

       35
       35
       -
           longDescription = ''

     

       36
       36
       -
             pysqlite is a DB-API 2.0-compliant database interface for SQLite.

     

       37
       37
       -
       

     

       38
       38
       -
             SQLite is a relational database management system contained in

     

       39
       39
       -
             a relatively small C library.  It is a public domain project

     

       40
       40
       -
             created by D. Richard Hipp.  Unlike the usual client-server

     

       41
       41
       -
             paradigm, the SQLite engine is not a standalone process with

     

       42
       42
       -
             which the program communicates, but is linked in and thus

     

       43
       43
       -
             becomes an integral part of the program.  The library

     

       44
       44
       -
             implements most of SQL-92 standard, including transactions,

     

       45
       45
       -
             triggers and most of complex queries.

     

       46
       46
       -
       

     

       47
       47
       -
             pysqlite makes this powerful embedded SQL engine available to

     

       48
       48
       -
             Python programmers.  It stays compatible with the Python

     

       49
       49
       -
             database API specification 2.0 as much as possible, but also

     

       50
       50
       -
             exposes most of SQLite's native API, so that it is for example

     

       51
       51
       -
             possible to create user-defined SQL functions and aggregates

     

       52
       52
       -
             in Python.

     

       53
       53
       -
           '';

     

       54
       54
       -
           license = licenses.bsd3;

     

       55
       55
       -
         };

     

       56
       56
       -
       

     

       57
       57
       -
       }

-30

pkgs/development/python2-modules/pytest-runner/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }:

     

       2
       2
       -
       

     

       3
       3
       -
       buildPythonPackage rec {

     

       4
       4
       -
         pname = "pytest-runner";

     

       5
       5
       -
         version = "5.2";

     

       6
       6
       -
       

     

       7
       7
       -
         src = fetchPypi {

     

       8
       8
       -
           inherit pname version;

     

       9
       9
       -
           sha256 = "96c7e73ead7b93e388c5d614770d2bae6526efd997757d3543fe17b557a0942b";

     

       10
       10
       -
         };

     

       11
       11
       -
       

     

       12
       12
       -
         nativeBuildInputs = [ setuptools-scm pytest ];

     

       13
       13
       -
       

     

       14
       14
       -
         postPatch = ''

     

       15
       15
       -
           rm pytest.ini

     

       16
       16
       -
         '';

     

       17
       17
       -
       

     

       18
       18
       -
         checkPhase = ''

     

       19
       19
       -
           py.test tests

     

       20
       20
       -
         '';

     

       21
       21
       -
       

     

       22
       22
       -
         # Fixture not found

     

       23
       23
       -
         doCheck = false;

     

       24
       24
       -
       

     

       25
       25
       -
         meta = with lib; {

     

       26
       26
       -
           description = "Invoke py.test as distutils command with dependency resolution";

     

       27
       27
       -
           homepage = "https://github.com/pytest-dev/pytest-runner";

     

       28
       28
       -
           license = licenses.mit;

     

       29
       29
       -
         };

     

       30
       30
       -
       }

-50

pkgs/development/python2-modules/s3transfer/default.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , fetchPypi

     

       3
       3
       -
       , pythonOlder

     

       4
       4
       -
       , buildPythonPackage

     

       5
       5
       -
       , docutils

     

       6
       6
       -
       , mock

     

       7
       7
       -
       , nose

     

       8
       8
       -
       , coverage

     

       9
       9
       -
       , wheel

     

       10
       10
       -
       , botocore

     

       11
       11
       -
       , futures ? null

     

       12
       12
       -
       }:

     

       13
       13
       -
       

     

       14
       14
       -
       buildPythonPackage rec {

     

       15
       15
       -
         pname = "s3transfer";

     

       16
       16
       -
         version = "0.4.2";

     

       17
       17
       -
       

     

       18
       18
       -
         src = fetchPypi {

     

       19
       19
       -
           inherit pname version;

     

       20
       20
       -
           sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI=";

     

       21
       21
       -
         };

     

       22
       22
       -
       

     

       23
       23
       -
         propagatedBuildInputs =

     

       24
       24
       -
           [

     

       25
       25
       -
             botocore

     

       26
       26
       -
           ] ++ lib.optional (pythonOlder "3") futures;

     

       27
       27
       -
       

     

       28
       28
       -
         buildInputs = [

     

       29
       29
       -
           docutils

     

       30
       30
       -
           mock

     

       31
       31
       -
           nose

     

       32
       32
       -
           coverage

     

       33
       33
       -
           wheel

     

       34
       34
       -
         ];

     

       35
       35
       -
       

     

       36
       36
       -
         checkPhase = ''

     

       37
       37
       -
           pushd s3transfer/tests

     

       38
       38
       -
           nosetests -v unit/ functional/

     

       39
       39
       -
           popd

     

       40
       40
       -
         '';

     

       41
       41
       -
       

     

       42
       42
       -
         # version on pypi has no tests/ dir

     

       43
       43
       -
         doCheck = false;

     

       44
       44
       -
       

     

       45
       45
       -
         meta = with lib; {

     

       46
       46
       -
           homepage = "https://github.com/boto/s3transfer";

     

       47
       47
       -
           license = licenses.asl20;

     

       48
       48
       -
           description = "A library for managing Amazon S3 transfers";

     

       49
       49
       -
         };

     

       50
       50
       -
       }

-28

pkgs/development/python2-modules/scandir/add-aarch64-darwin-dirent.patch

···

       1
       1
       -
       diff --git a/scandir.py b/scandir.py

     

       2
       2
       -
       index 3f602fb..40af3e5 100644

     

       3
       3
       -
       --- a/scandir.py

     

       4
       4
       -
       +++ b/scandir.py

     

       5
       5
       -
       @@ -23,6 +23,7 @@ from os import listdir, lstat, stat, strerror

     

       6
       6
       -
        from os.path import join, islink

     

       7
       7
       -
        from stat import S_IFDIR, S_IFLNK, S_IFREG

     

       8
       8
       -
        import collections

     

       9
       9
       -
       +import platform

     

       10
       10
       -
        import sys

     

       11
       11
       -
        

     

       12
       12
       -
        try:

     

       13
       13
       -
       @@ -432,6 +433,15 @@ elif sys.platform.startswith(('linux', 'darwin', 'sunos5')) or 'bsd' in sys.plat

     

       14
       14
       -
                            ('__d_padding', ctypes.c_uint8 * 4),

     

       15
       15
       -
                            ('d_name', ctypes.c_char * 256),

     

       16
       16
       -
                        )

     

       17
       17
       -
       +            elif 'darwin' in sys.platform and 'arm64' in platform.machine():

     

       18
       18
       -
       +                _fields_ = (

     

       19
       19
       -
       +                    ('d_ino', ctypes.c_uint64),

     

       20
       20
       -
       +                    ('d_off', ctypes.c_uint64),

     

       21
       21
       -
       +                    ('d_reclen', ctypes.c_uint16),

     

       22
       22
       -
       +                    ('d_namlen', ctypes.c_uint16),

     

       23
       23
       -
       +                    ('d_type', ctypes.c_uint8),

     

       24
       24
       -
       +                    ('d_name', ctypes.c_char * 1024),

     

       25
       25
       -
       +                )

     

       26
       26
       -
                    else:

     

       27
       27
       -
                        _fields_ = (

     

       28
       28
       -
                            ('d_ino', ctypes.c_uint32),  # must be uint32, not ulong

-24

pkgs/development/python2-modules/scandir/default.nix

···

       1
       1
       -
       { lib, python, buildPythonPackage, fetchPypi }:

     

       2
       2
       -
       

     

       3
       3
       -
       buildPythonPackage rec {

     

       4
       4
       -
         pname = "scandir";

     

       5
       5
       -
         version = "1.10.0";

     

       6
       6
       -
       

     

       7
       7
       -
         src = fetchPypi {

     

       8
       8
       -
           inherit pname version;

     

       9
       9
       -
           sha256 = "1bkqwmf056pkchf05ywbnf659wqlp6lljcdb0y88wr9f0vv32ijd";

     

       10
       10
       -
         };

     

       11
       11
       -
       

     

       12
       12
       -
         patches = [

     

       13
       13
       -
           ./add-aarch64-darwin-dirent.patch

     

       14
       14
       -
         ];

     

       15
       15
       -
       

     

       16
       16
       -
         checkPhase = "${python.interpreter} test/run_tests.py";

     

       17
       17
       -
       

     

       18
       18
       -
         meta = with lib; {

     

       19
       19
       -
           description = "A better directory iterator and faster os.walk()";

     

       20
       20
       -
           homepage = "https://github.com/benhoyt/scandir";

     

       21
       21
       -
           license = licenses.gpl3;

     

       22
       22
       -
           maintainers = with maintainers; [ abbradar ];

     

       23
       23
       -
         };

     

       24
       24
       -
       }

-82

pkgs/development/python2-modules/sphinx/default.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , buildPythonPackage

     

       3
       3
       -
       , fetchPypi

     

       4
       4
       -
       , pytest

     

       5
       5
       -
       , simplejson

     

       6
       6
       -
       , mock

     

       7
       7
       -
       , glibcLocales

     

       8
       8
       -
       , html5lib

     

       9
       9
       -
       , pythonOlder

     

       10
       10
       -
       , enum34

     

       11
       11
       -
       , python

     

       12
       12
       -
       , docutils

     

       13
       13
       -
       , jinja2

     

       14
       14
       -
       , pygments

     

       15
       15
       -
       , alabaster

     

       16
       16
       -
       , babel

     

       17
       17
       -
       , snowballstemmer

     

       18
       18
       -
       , six

     

       19
       19
       -
       , sqlalchemy

     

       20
       20
       -
       , whoosh

     

       21
       21
       -
       , imagesize

     

       22
       22
       -
       , requests

     

       23
       23
       -
       , typing

     

       24
       24
       -
       , sphinxcontrib-websupport

     

       25
       25
       -
       , setuptools

     

       26
       26
       -
       }:

     

       27
       27
       -
       

     

       28
       28
       -
       buildPythonPackage rec {

     

       29
       29
       -
         pname = "sphinx";

     

       30
       30
       -
         version = "1.8.5";

     

       31
       31
       -
         src = fetchPypi {

     

       32
       32
       -
           pname = "Sphinx";

     

       33
       33
       -
           inherit version;

     

       34
       34
       -
           sha256 = "c7658aab75c920288a8cf6f09f244c6cfdae30d82d803ac1634d9f223a80ca08";

     

       35
       35
       -
         };

     

       36
       36
       -
         LC_ALL = "en_US.UTF-8";

     

       37
       37
       -
       

     

       38
       38
       -
         checkInputs = [ pytest ];

     

       39
       39
       -
         buildInputs = [ simplejson mock glibcLocales html5lib ] ++ lib.optional (pythonOlder "3.4") enum34;

     

       40
       40
       -
         # Disable two tests that require network access.

     

       41
       41
       -
         checkPhase = ''

     

       42
       42
       -
           cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored'

     

       43
       43
       -
         '';

     

       44
       44
       -
         propagatedBuildInputs = [

     

       45
       45
       -
           docutils

     

       46
       46
       -
           jinja2

     

       47
       47
       -
           pygments

     

       48
       48
       -
           alabaster

     

       49
       49
       -
           babel

     

       50
       50
       -
           setuptools

     

       51
       51
       -
           snowballstemmer

     

       52
       52
       -
           six

     

       53
       53
       -
           sphinxcontrib-websupport

     

       54
       54
       -
           sqlalchemy

     

       55
       55
       -
           whoosh

     

       56
       56
       -
           imagesize

     

       57
       57
       -
           requests

     

       58
       58
       -
         ] ++ lib.optional (pythonOlder "3.5") typing;

     

       59
       59
       -
       

     

       60
       60
       -
         # Lots of tests. Needs network as well at some point.

     

       61
       61
       -
         doCheck = false;

     

       62
       62
       -
       

     

       63
       63
       -
         patches = [

     

       64
       64
       -
           # Since pygments 2.5, PythonLexer refers to python3. If we want to use

     

       65
       65
       -
           # python2, we need to explicitly specify Python2Lexer.

     

       66
       66
       -
           # Not upstreamed since there doesn't seem to be any upstream maintenance

     

       67
       67
       -
           # branch for 1.8 (and this patch doesn't make any sense for 2.x).

     

       68
       68
       -
           ./python2-lexer.patch

     

       69
       69
       -
         ];

     

       70
       70
       -
         # https://github.com/NixOS/nixpkgs/issues/22501

     

       71
       71
       -
         # Do not run `python sphinx-build arguments` but `sphinx-build arguments`.

     

       72
       72
       -
         postPatch = ''

     

       73
       73
       -
           substituteInPlace sphinx/make_mode.py --replace "sys.executable, " ""

     

       74
       74
       -
         '';

     

       75
       75
       -
       

     

       76
       76
       -
         meta = {

     

       77
       77
       -
           description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects";

     

       78
       78
       -
           homepage = "http://sphinx.pocoo.org/";

     

       79
       79
       -
           license = lib.licenses.bsd3;

     

       80
       80
       -
           maintainers = with lib.maintainers; [ ];

     

       81
       81
       -
         };

     

       82
       82
       -
       }

-22

pkgs/development/python2-modules/sphinx/python2-lexer.patch

···

       1
       1
       -
       diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py

     

       2
       2
       -
       index ac2bd1b06..63ca52de2 100644

     

       3
       3
       -
       --- a/sphinx/highlighting.py

     

       4
       4
       -
       +++ b/sphinx/highlighting.py

     

       5
       5
       -
       @@ -16,7 +16,7 @@ from pygments.filters import ErrorToken

     

       6
       6
       -
        from pygments.formatters import HtmlFormatter, LatexFormatter

     

       7
       7
       -
        from pygments.lexer import Lexer  # NOQA

     

       8
       8
       -
        from pygments.lexers import get_lexer_by_name, guess_lexer

     

       9
       9
       -
       -from pygments.lexers import PythonLexer, Python3Lexer, PythonConsoleLexer, \

     

       10
       10
       -
       +from pygments.lexers import Python2Lexer, Python3Lexer, PythonConsoleLexer, \

     

       11
       11
       -
            CLexer, TextLexer, RstLexer

     

       12
       12
       -
        from pygments.styles import get_style_by_name

     

       13
       13
       -
        from pygments.util import ClassNotFound

     

       14
       14
       -
       @@ -40,7 +40,7 @@ logger = logging.getLogger(__name__)

     

       15
       15
       -
        

     

       16
       16
       -
        lexers = dict(

     

       17
       17
       -
            none = TextLexer(stripnl=False),

     

       18
       18
       -
       -    python = PythonLexer(stripnl=False),

     

       19
       19
       -
       +    python = Python2Lexer(stripnl=False),

     

       20
       20
       -
            python3 = Python3Lexer(stripnl=False),

     

       21
       21
       -
            pycon = PythonConsoleLexer(stripnl=False),

     

       22
       22
       -
            pycon3 = PythonConsoleLexer(python3=True, stripnl=False),

-25

pkgs/development/python2-modules/sphinxcontrib-websupport/default.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , buildPythonPackage

     

       3
       3
       -
       , fetchPypi

     

       4
       4
       -
       , six

     

       5
       5
       -
       }:

     

       6
       6
       -
       

     

       7
       7
       -
       buildPythonPackage rec {

     

       8
       8
       -
         pname = "sphinxcontrib-websupport";

     

       9
       9
       -
         version = "1.1.2";

     

       10
       10
       -
       

     

       11
       11
       -
         src = fetchPypi {

     

       12
       12
       -
           inherit pname version;

     

       13
       13
       -
           sha256 = "1501befb0fdf1d1c29a800fdbf4ef5dc5369377300ddbdd16d2cd40e54c6eefc";

     

       14
       14
       -
         };

     

       15
       15
       -
       

     

       16
       16
       -
         propagatedBuildInputs = [ six ];

     

       17
       17
       -
       

     

       18
       18
       -
         doCheck = false;

     

       19
       19
       -
       

     

       20
       20
       -
         meta = {

     

       21
       21
       -
           description = "Sphinx API for Web Apps";

     

       22
       22
       -
           homepage = "http://sphinx-doc.org/";

     

       23
       23
       -
           license = lib.licenses.bsd2;

     

       24
       24
       -
         };

     

       25
       25
       -
       }

-32

pkgs/development/python2-modules/typing/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, pythonOlder, isPy3k, isPyPy, unittestCheckHook

     

       2
       2
       -
       , pythonAtLeast }:

     

       3
       3
       -
       

     

       4
       4
       -
       let

     

       5
       5
       -
         testDir = if isPy3k then "src" else "python2";

     

       6
       6
       -
       

     

       7
       7
       -
       in buildPythonPackage rec {

     

       8
       8
       -
         pname = "typing";

     

       9
       9
       -
         version = "3.10.0.0";

     

       10
       10
       -
       

     

       11
       11
       -
         src = fetchPypi {

     

       12
       12
       -
           inherit pname version;

     

       13
       13
       -
           sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130";

     

       14
       14
       -
         };

     

       15
       15
       -
       

     

       16
       16
       -
         disabled = pythonAtLeast "3.5";

     

       17
       17
       -
       

     

       18
       18
       -
         # Error for Python3.6: ImportError: cannot import name 'ann_module'

     

       19
       19
       -
         # See https://github.com/python/typing/pull/280

     

       20
       20
       -
         # Also, don't bother on PyPy: AssertionError: TypeError not raised

     

       21
       21
       -
         doCheck = pythonOlder "3.6" && !isPyPy;

     

       22
       22
       -
       

     

       23
       23
       -
         checkInputs = [ unittestCheckHook ];

     

       24
       24
       -
       

     

       25
       25
       -
         unittestFlagsArray = [ "-s" testDir ];

     

       26
       26
       -
       

     

       27
       27
       -
         meta = with lib; {

     

       28
       28
       -
           description = "Backport of typing module to Python versions older than 3.5";

     

       29
       29
       -
           homepage = "https://docs.python.org/3/library/typing.html";

     

       30
       30
       -
           license = licenses.psfl;

     

       31
       31
       -
         };

     

       32
       32
       -
       }

+5 -5

pkgs/development/tools/build-managers/bmake/default.nix

···

       3
       3
        
       , fetchurl

     

       4
       4
        
       , fetchpatch

     

       5
       5
        
       , getopt

     

       6
       6
       -
       , tzdata

     

       7
       6
        
       , ksh

     

       7
       7
       +
       , tzdata

     

       8
       8
        
       , pkgsMusl # for passthru.tests

     

       9
       9
        
       }:

     

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation (finalAttrs: {

     

       12
       12
        
         pname = "bmake";

     

       13
       13
       -
         version = "20220726";

     

       13
       13
       +
         version = "20220928";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchurl {

     

       16
       16
        
           url = "http://www.crufty.net/ftp/pub/sjg/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";

     

       17
       17
       -
           hash = "sha256-G/N3B4lyJyHcp7C/+K/EqVINog8CGbt7xSNQrwEz8KA=";

     

       17
       17
       +
           hash = "sha256-yAS3feP+uOMd7ipMn7Hp7CTFo0dk56KBXIi07QFlDpA=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         # Make tests work with musl

     
···

       41
       41
        
           (fetchpatch {

     

       42
       42
        
             name = "separate-tests.patch";

     

       43
       43
        
             url = "https://raw.githubusercontent.com/alpinelinux/aports/2a36f7b79df44136c4d2b8e9512f908af65adfee/community/bmake/separate-tests.patch";

     

       44
       44
       -
             sha256 = "00s76jwyr83c6rkvq67b1lxs8jhm0gj2rjgy77xazqr5400slj9a";

     

       44
       44
       +
             hash = "sha256-KkmqASAl46/6Of7JLOQDFUqkOw3rGLxnNmyg7Lk0RwM=";

     

       45
       45
        
           })

     

       46
       46
        
           # add a shebang to bmake's install(1) replacement

     

       47
       47
        
           (fetchpatch {

     

       48
       48
        
             name = "install-sh.patch";

     

       49
       49
        
             url = "https://raw.githubusercontent.com/alpinelinux/aports/34cd8c45397c63c041cf3cbe1ba5232fd9331196/community/bmake/install-sh.patch";

     

       50
       50
       -
             sha256 = "0z8icd6akb96r4cksqnhynkn591vbxlmrrs4w6wil3r6ggk6mwa6";

     

       50
       50
       +
             hash = "sha256-RvFq5nsmDxq54UTnXGlfO6Rip/XQYj0ZySatqUxjEX0=";

     

       51
       51
        
           })

     

       52
       52
        
         ];

     

       53
       53

+2 -2

pkgs/development/tools/memray/default.nix

···

       8
       8
        
       

     

       9
       9
        
       python3.pkgs.buildPythonApplication rec {

     

       10
       10
        
         pname = "memray";

     

       11
       11
       -
         version = "1.4.1";

     

       11
       11
       +
         version = "1.5.0";

     

       12
       12
        
         format = "setuptools";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "bloomberg";

     

       16
       16
        
           repo = pname;

     

       17
       17
        
           rev = "refs/tags/v${version}";

     

       18
       18
       -
           hash = "sha256-Lq2qDTGkyG3qZaxF3umUHBWf0Dgy1ds6bTUe4y3u7Qc=";

     

       18
       18
       +
           hash = "sha256-BnsboMjlMDfDsqR3UU/bxQpyUaqCDuglaqwTPOF79Fc=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [

+3

pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix

···

       52
       52
        
         meta = with lib; {

     

       53
       53
        
           inherit (python.meta) platforms;

     

       54
       54
        
           maintainers = with maintainers; [ adisbladis jakewaksbaum ];

     

       55
       55
       +
           knownVulnerabilities = [

     

       56
       56
       +
             "CVE-2022-42966"  # cleo version in poetry.lock is vulnerable

     

       57
       57
       +
           ];

     

       55
       58
        
         };

     

       56
       59
        
       }

+6 -6

pkgs/development/tools/rust/cargo-tally/default.nix

···

       1
       1
       -
       { lib, rustPlatform, fetchCrate, stdenv, DiskArbitration, Foundation, IOKit }:

     

       1
       1
       +
       { lib, rustPlatform, fetchCrate, stdenv, darwin }:

     

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "cargo-tally";

     

       5
       5
       -
         version = "1.0.17";

     

       5
       5
       +
         version = "1.0.18";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchCrate {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "sha256-vtVE7BITzYP9vhSj7HfDm0Mar2bRPmeW1/mE977vvrA=";

     

       9
       9
       +
           sha256 = "sha256-BlWPdZb85XaTGV6ZE3XRVKHJyXimfrezhRyqJVmCFMY=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         cargoSha256 = "sha256-VHlnRk5EXZjf+EW/clDOFA+ohh9SqJiRvq1xQcP0Wrk=";

     

       12
       12
       +
         cargoSha256 = "sha256-1qtlsItLP8MdxebgktzTr3R4Kq+PBIAiHGaikbQ796E=";

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = lib.optionals stdenv.isDarwin [

     

       14
       14
       +
         buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [

     

       15
       15
        
           DiskArbitration

     

       16
       16
        
           Foundation

     

       17
       17
        
           IOKit

     

       18
       18
       -
         ];

     

       18
       18
       +
         ]);

     

       19
       19
        
       

     

       20
       20
        
         meta = with lib; {

     

       21
       21
        
           description = "Graph the number of crates that depend on your crate over time";

+5 -5

pkgs/development/web/bun/default.nix

···

       12
       12
        
       }:

     

       13
       13
        
       

     

       14
       14
        
       stdenvNoCC.mkDerivation rec {

     

       15
       15
       -
         version = "0.2.2";

     

       15
       15
       +
         version = "0.3.0";

     

       16
       16
        
         pname = "bun";

     

       17
       17
        
       

     

       18
       18
        
         src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");

     
···

       33
       33
        
           sources = {

     

       34
       34
        
             "aarch64-darwin" = fetchurl {

     

       35
       35
        
               url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";

     

       36
       36
       -
               sha256 = "IIy5ZEx/+StAhtRcGqM3uvvEqu4wGzGUls0K/ot4jRI=";

     

       36
       36
       +
               sha256 = "CPoSo8Kqu87c0bF4J2KSoamz6bsfS/DnkYqRi+XL8Qw=";

     

       37
       37
        
             };

     

       38
       38
        
             "aarch64-linux" = fetchurl {

     

       39
       39
        
               url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";

     

       40
       40
       -
               sha256 = "5cScLXujNm14+SCr8OcO93RDL3EfAjsuAzfcwj+EMKs=";

     

       40
       40
       +
               sha256 = "0ymZ4cYJn3Qth4jiTeXuAAsY0wFrYO2OHumY5WLamME=";

     

       41
       41
        
             };

     

       42
       42
        
             "x86_64-darwin" = fetchurl {

     

       43
       43
        
               url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";

     

       44
       44
       -
               sha256 = "3PdLVz4qTJQHmM9laL413xnZaSuD6xlaSy8cuJ9M8us=";

     

       44
       44
       +
               sha256 = "8f5w+wu1vId0R7UQsdbi/yopw1R00lR9ibEAOYwUglI=";

     

       45
       45
        
             };

     

       46
       46
        
             "x86_64-linux" = fetchurl {

     

       47
       47
        
               url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";

     

       48
       48
       -
               sha256 = "eVEopSvyjzY8J3q52wowTlSVHZ4s1lIc8/yU6Ya+0QU=";

     

       48
       48
       +
               sha256 = "bnuz+n8pAhBUgQKImCUKRZCwIqGHHaB3KtZOVfqy4Zw=";

     

       49
       49
        
             };

     

       50
       50
        
           };

     

       51
       51
        
           updateScript = writeShellScript "update-bun" ''

+42 -59

pkgs/games/spring/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenv

     

       3
       3
       -
       , fetchFromGitHub

     

       4
       4
       -
       , cmake

     

       5
       5
       -
       , xz

     

       6
       6
       -
       , boost

     

       7
       7
       -
       , libdevil

     

       8
       8
       -
       , zlib

     

       9
       9
       -
       , p7zip

     

       10
       10
       -
       , openal

     

       11
       11
       -
       , libvorbis

     

       12
       12
       -
       , glew

     

       13
       13
       -
       , freetype

     

       14
       14
       -
       , xorg

     

       15
       15
       -
       , SDL2

     

       16
       16
       -
       , libGLU

     

       17
       17
       -
       , libGL

     

       18
       3
        
       , asciidoc

     

       4
       4
       +
       , boost

     

       5
       5
       +
       , cmake

     

       6
       6
       +
       , curl

     

       19
       7
        
       , docbook_xsl

     

       20
       8
        
       , docbook_xsl_ns

     

       21
       21
       -
       , curl

     

       22
       22
       -
       , makeWrapper

     

       9
       9
       +
       , fetchurl

     

       10
       10
       +
       , freetype

     

       11
       11
       +
       , glew

     

       23
       12
        
       , jdk

     

       24
       24
       -
       , python

     

       25
       25
       -
       , systemd

     

       13
       13
       +
       , libdevil

     

       14
       14
       +
       , libGL

     

       15
       15
       +
       , libGLU

     

       26
       16
        
       , libunwind

     

       27
       27
       -
       , which

     

       17
       17
       +
       , libvorbis

     

       18
       18
       +
       , makeWrapper

     

       28
       19
        
       , minizip

     

       20
       20
       +
       , openal

     

       21
       21
       +
       , p7zip

     

       22
       22
       +
       , python3

     

       23
       23
       +
       , SDL2

     

       24
       24
       +
       , xorg

     

       25
       25
       +
       , xz

     

       26
       26
       +
       , zlib

     

       29
       27
        
       , withAI ? true # support for AI Interfaces and Skirmish AIs

     

       30
       28
        
       }:

     

       31
       29
        
       

     

       32
       30
        
       stdenv.mkDerivation rec {

     

       33
       31
        
         pname = "spring";

     

       34
       34
       -
         version = "105.0.1-${buildId}-g${shortRev}";

     

       35
       35
       -
         # usually the latest in https://github.com/spring/spring/commits/maintenance

     

       36
       36
       -
         rev = "8581792eac65e07cbed182ccb1e90424ce3bd8fc";

     

       37
       37
       -
         shortRev = builtins.substring 0 7 rev;

     

       38
       38
       -
         buildId = "1486";

     

       32
       32
       +
         version = "106.0";

     

       39
       33
        
       

     

       40
       40
       -
         # taken from https://github.com/spring/spring/commits/maintenance

     

       41
       41
       -
         src = fetchFromGitHub {

     

       42
       42
       -
           owner = "spring";

     

       43
       43
       -
           repo = pname;

     

       44
       44
       -
           inherit rev;

     

       45
       45
       -
           sha256 = "05lvd8grqmv7vl8rrx02rhl0qhmm58dyi6s78b64j3fkia4sfj1r";

     

       46
       46
       -
           fetchSubmodules = true;

     

       34
       34
       +
         src = fetchurl {

     

       35
       35
       +
           url = "https://springrts.com/dl/buildbot/default/master/${version}/source/spring_${version}_src.tar.gz";

     

       36
       36
       +
           sha256 = "sha256-mSA4ioIv68NMEB72lYnwDb1QOuWr1VHwu4+grAoHlV0=";

     

       47
       37
        
         };

     

       48
       38
        
       

     

       49
       49
       -
         # The cmake included module correcly finds nix's glew, however

     

       50
       50
       -
         # it has to be the bundled FindGLEW for headless or dedicated builds

     

       51
       51
       -
         prePatch = ''

     

       39
       39
       +
         postPatch = ''

     

       40
       40
       +
           patchShebangs .

     

       41
       41
       +
       

     

       52
       42
        
           substituteInPlace ./rts/build/cmake/FindAsciiDoc.cmake \

     

       53
       43
        
             --replace "PATHS /usr /usr/share /usr/local /usr/local/share" "PATHS ${docbook_xsl}"\

     

       54
       44
        
             --replace "xsl/docbook/manpages" "share/xml/docbook-xsl/manpages"

     

       55
       55
       -
           substituteInPlace ./rts/Rendering/GL/myGL.cpp \

     

       56
       56
       -
             --replace "static constexpr const GLubyte* qcriProcName" "static const GLubyte* qcriProcName"

     

       57
       57
       -
           patchShebangs .

     

       45
       45
       +
       

     

       46
       46
       +
           # The cmake included module correcly finds nix's glew, however

     

       47
       47
       +
           # it has to be the bundled FindGLEW for headless or dedicated builds

     

       58
       48
        
           rm rts/build/cmake/FindGLEW.cmake

     

       59
       59
       -
       

     

       60
       60
       -
           echo "${version} maintenance" > VERSION

     

       61
       49
        
         '';

     

       62
       50
        
       

     

       63
       51
        
         cmakeFlags = [

     
···

       68
       56
        
       

     

       69
       57
        
         nativeBuildInputs = [ cmake makeWrapper docbook_xsl docbook_xsl_ns asciidoc ];

     

       70
       58
        
         buildInputs = [

     

       71
       71
       -
           xz

     

       72
       59
        
           boost

     

       60
       60
       +
           curl

     

       61
       61
       +
           freetype

     

       62
       62
       +
           glew

     

       73
       63
        
           libdevil

     

       74
       74
       -
           zlib

     

       75
       75
       -
           p7zip

     

       76
       76
       -
           openal

     

       64
       64
       +
           libGL

     

       65
       65
       +
           libGLU

     

       66
       66
       +
           libunwind

     

       77
       67
        
           libvorbis

     

       78
       78
       -
           freetype

     

       68
       68
       +
           minizip

     

       69
       69
       +
           openal

     

       70
       70
       +
           p7zip

     

       79
       71
        
           SDL2

     

       80
       72
        
           xorg.libX11

     

       81
       73
        
           xorg.libXcursor

     

       82
       82
       -
           libGLU

     

       83
       83
       -
           libGL

     

       84
       84
       -
           glew

     

       85
       85
       -
           curl

     

       86
       86
       -
           systemd

     

       87
       87
       -
           libunwind

     

       88
       88
       -
           which

     

       89
       89
       -
           minizip

     

       74
       74
       +
           xz

     

       75
       75
       +
           zlib

     

       90
       76
        
         ]

     

       91
       91
       -
         ++ lib.optional withAI jdk

     

       92
       92
       -
         ++ lib.optional withAI python;

     

       93
       93
       -
       

     

       94
       94
       -
         NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility

     

       77
       77
       +
         ++ lib.optionals withAI [ python3 jdk ];

     

       95
       78
        
       

     

       96
       79
        
         postInstall = ''

     

       97
       80
        
           wrapProgram "$out/bin/spring" \

     

       98
       98
       -
             --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc systemd ]}"

     

       81
       81
       +
             --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"

     

       99
       82
        
         '';

     

       100
       83
        
       

     

       101
       84
        
         meta = with lib; {

     
···

       103
       86
        
           description = "A powerful real-time strategy (RTS) game engine";

     

       104
       87
        
           license = licenses.gpl2Plus;

     

       105
       88
        
           maintainers = with maintainers; [ qknight domenkozar sorki ];

     

       106
       106
       -
           platforms = [ "i686-linux" "x86_64-linux" ];

     

       89
       89
       +
           platforms = [ "x86_64-linux" ];

     

       107
       90
        
         };

     

       108
       91
        
       }

+45

pkgs/os-specific/darwin/pam-reattach/default.nix

···

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, cmake, openpam, darwin }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         sdk =

     

       5
       5
       +
           if stdenv.isAarch64

     

       6
       6
       +
           then null

     

       7
       7
       +
           else darwin.apple_sdk.sdk;

     

       8
       8
       +
       in

     

       9
       9
       +
       

     

       10
       10
       +
       stdenv.mkDerivation rec {

     

       11
       11
       +
         pname = "pam_reattach";

     

       12
       12
       +
         version = "1.3";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "fabianishere";

     

       16
       16
       +
           repo = pname;

     

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

     

       18
       18
       +
           sha256 = "1k77kxqszdwgrb50w7algj22pb4fy5b9649cjb08zq9fqrzxcbz7";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         cmakeFlags = [

     

       22
       22
       +
           "-DCMAKE_OSX_ARCHITECTURES=${

     

       23
       23
       +
             if stdenv.hostPlatform.system == "x86_64-darwin" then

     

       24
       24
       +
               "x86_64"

     

       25
       25
       +
             else

     

       26
       26
       +
               "arm64"

     

       27
       27
       +
           }"

     

       28
       28
       +
           "-DENABLE_CLI=ON"

     

       29
       29
       +
         ]

     

       30
       30
       +
         ++ lib.optional (sdk != null)

     

       31
       31
       +
           "-DCMAKE_LIBRARY_PATH=${sdk}/usr/lib";

     

       32
       32
       +
       

     

       33
       33
       +
         buildInputs = [ openpam ]

     

       34
       34
       +
           ++ lib.optional (sdk != null) sdk;

     

       35
       35
       +
       

     

       36
       36
       +
         nativeBuildInputs = [ cmake ];

     

       37
       37
       +
       

     

       38
       38
       +
         meta = with lib; {

     

       39
       39
       +
           homepage = "https://github.com/fabianishere/pam_reattach";

     

       40
       40
       +
           description = "Reattach to the user's GUI session on macOS during authentication (for Touch ID support in tmux)";

     

       41
       41
       +
           license = licenses.mit;

     

       42
       42
       +
           maintainers = with maintainers; [ lockejan ];

     

       43
       43
       +
           platforms = platforms.darwin;

     

       44
       44
       +
         };

     

       45
       45
       +
       }

+2 -2

pkgs/servers/jackett/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildDotnetModule rec {

     

       11
       11
        
         pname = "jackett";

     

       12
       12
       -
         version = "0.20.2325";

     

       12
       12
       +
         version = "0.20.2352";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = pname;

     

       16
       16
        
           repo = pname;

     

       17
       17
        
           rev = "v${version}";

     

       18
       18
       -
           sha256 = "LFdgvLFdVSkSaJKonbFz+Wi6+BWkIcybNLvW0C21FOU=";

     

       18
       18
       +
           sha256 = "vxe5B+R5zxKlvnxnXXw9tfgtXGNlEZF3z14NZ7pA3zE=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         projectFile = "src/Jackett.Server/Jackett.Server.csproj";

+1

pkgs/servers/jackett/deps.nix

···

       181
       181
        
         (fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.1"; sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv"; })

     

       182
       182
        
         (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; })

     

       183
       183
        
         (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })

     

       184
       184
       +
         (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; })

     

       184
       185
        
         (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; })

     

       185
       186
        
         (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; })

     

       186
       187
        
         (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; })

+2 -2

pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json

···

       1
       1
        
       {

     

       2
       2
        
         "name": "matrix-appservice-slack",

     

       3
       3
       -
         "version": "2.0.1",

     

       3
       3
       +
         "version": "2.0.2",

     

       4
       4
        
         "description": "A Matrix <--> Slack bridge",

     

       5
       5
        
         "engines": {

     

       6
       6
        
           "node": ">=16 <=18"

     
···

       38
       38
        
           "Slackdown": "git+https://Half-Shot@github.com/half-shot/slackdown.git",

     

       39
       39
        
           "axios": "^0.27.2",

     

       40
       40
        
           "escape-string-regexp": "^4.0.0",

     

       41
       41
       -
           "matrix-appservice-bridge": "^5.1.0",

     

       41
       41
       +
           "matrix-appservice-bridge": "^6.0.0",

     

       42
       42
        
           "minimist": "^1.2.6",

     

       43
       43
        
           "nedb": "^1.8.0",

     

       44
       44
        
           "node-emoji": "^1.10.0",

+3 -3

pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json

···

       1
       1
        
       {

     

       2
       2
       -
         "version": "2.0.1",

     

       3
       3
       -
         "srcHash": "N7EzhqKL3GiuoU2d/Y33eZhKJSCvtLDRVO40mpIBEkw=",

     

       4
       4
       -
         "yarnHash": "1d9kyrzcs1c54xk0yl8n3jp61l3n8dzph1d5a4daifa7ad635hv7"

     

       2
       2
       +
         "version": "2.0.2",

     

       3
       3
       +
         "srcHash": "Z8PQuAOQbQMxmso/KV9n8fu2FqzqLsADqLczmm584QQ=",

     

       4
       4
       +
         "yarnHash": "1ngmgr9li7jagvzfl0jq4bxqw0q1sdqh8k9wlar6q292263g287z"

     

       5
       5
        
       }

+4

pkgs/servers/search/manticoresearch/default.nix

···

       58
       58
        
       

     

       59
       59
        
         cmakeFlags = [

     

       60
       60
        
           "-DWITH_GALERA=0"

     

       61
       61
       +
           "-DWITH_MYSQL=1"

     

       62
       62
       +
           "-DMYSQL_INCLUDE_DIR=${mariadb-connector-c.dev}/include/mariadb"

     

       63
       63
       +
           "-DMYSQL_LIB=${mariadb-connector-c.out}/lib/mariadb/libmysqlclient.a"

     

       61
       64
        
         ];

     

       62
       65
        
       

     

       63
       66
        
         meta = with lib; {

     

       64
       67
        
           description = "Easy to use open source fast database for search";

     

       65
       68
        
           homepage = "https://manticoresearch.com";

     

       66
       69
        
           license = licenses.gpl2;

     

       70
       70
       +
           mainProgram = "searchd";

     

       67
       71
        
           maintainers = with maintainers; [ jdelStrother ];

     

       68
       72
        
           platforms = platforms.all;

     

       69
       73
        
         };

+14 -4

pkgs/servers/search/meilisearch/default.nix

···

       8
       8
        
       , nixosTests

     

       9
       9
        
       }:

     

       10
       10
        
       

     

       11
       11
       -
       let version = "0.30.0";

     

       11
       11
       +
       let version = "0.30.2";

     

       12
       12
        
       in

     

       13
       13
        
       rustPlatform.buildRustPackage {

     

       14
       14
        
         pname = "meilisearch";

     

       15
       15
        
         inherit version;

     

       16
       16
       +
       

     

       16
       17
        
         src = fetchFromGitHub {

     

       17
       18
        
           owner = "meilisearch";

     

       18
       19
        
           repo = "MeiliSearch";

     

       19
       20
        
           rev = "v${version}";

     

       20
       20
       -
           sha256 = "sha256-nw2aSEdd21iiFrV2EPOyCfSru84eNM59wsL+ipcSoDw=";

     

       21
       21
       +
           hash = "sha256-kxANzEORvR+BJDfLUD1FLorBuYjnUQixgD2jDoX6jrg=";

     

       21
       22
        
         };

     

       22
       22
       -
         cargoSha256 = "sha256-0JdI5I63ImdUUBQuC4LYqHpEA1xJ5QJ+3n3MTaIHKDI=";

     

       23
       23
       +
       

     

       24
       24
       +
         cargoHash = "sha256-IYNIr7PBNNloPizaauFYR9/NPnBMS8kQi+RNsKsNjLE=";

     

       25
       25
       +
       

     

       23
       26
        
         # Default features include mini dashboard which downloads something from the internet.

     

       24
       27
        
         buildNoDefaultFeatures = true;

     

       25
       25
       -
         buildInputs = lib.optionals stdenv.isDarwin [ Security DiskArbitration Foundation ];

     

       28
       28
       +
       

     

       29
       29
       +
         buildInputs = lib.optionals stdenv.isDarwin [

     

       30
       30
       +
           Security

     

       31
       31
       +
           DiskArbitration

     

       32
       32
       +
           Foundation

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       26
       35
        
         passthru.tests = {

     

       27
       36
        
           meilisearch = nixosTests.meilisearch;

     

       28
       37
        
         };

     
···

       33
       42
        
         meta = with lib; {

     

       34
       43
        
           description = "Powerful, fast, and an easy to use search engine ";

     

       35
       44
        
           homepage = "https://docs.meilisearch.com/";

     

       45
       45
       +
           changelog = "https://github.com/meilisearch/meilisearch/releases/tag/v${version}";

     

       36
       46
        
           license = licenses.mit;

     

       37
       47
        
           maintainers = with maintainers; [ happysalada ];

     

       38
       48
        
           platforms = [ "aarch64-darwin" "x86_64-linux" "x86_64-darwin" ];

+2 -2

pkgs/servers/web-apps/freshrss/default.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenvNoCC.mkDerivation rec {

     

       10
       10
        
         pname = "FreshRSS";

     

       11
       11
       -
         version = "1.20.1";

     

       11
       11
       +
         version = "1.20.2";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "FreshRSS";

     

       15
       15
        
           repo = "FreshRSS";

     

       16
       16
        
           rev = version;

     

       17
       17
       -
           hash = "sha256-hpxBPYNFw5Wz07SdYT9GLX8XicAtKi82HjlLCccQMtk=";

     

       17
       17
       +
           hash = "sha256-l1SOaQA4C8yXbrfi7pEE1PpUO4DVmLTTDUSACCSQ5LE=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         passthru.tests = nixosTests.freshrss;

+2 -2

pkgs/tools/admin/credhub-cli/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "credhub-cli";

     

       5
       5
       -
         version = "2.9.8";

     

       5
       5
       +
         version = "2.9.9";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "cloudfoundry-incubator";

     

       9
       9
        
           repo = "credhub-cli";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-lhnH4+/fwZKEDN1465T8+elinTkhjYbOX2aj5eRnwZk=";

     

       11
       11
       +
           sha256 = "sha256-hqmPv+/TNGzI9yMB7AnK7UOw6MI0jeII8A5KSIlulyk=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         # these tests require network access that we're not going to give them

+2 -2

pkgs/tools/audio/abcmidi/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "abcMIDI";

     

       5
       5
       -
         version = "2022.09.01";

     

       5
       5
       +
         version = "2022.12.05";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchzip {

     

       8
       8
        
           url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";

     

       9
       9
       -
           hash = "sha256-to9hbhW7t5On4PrQEm2CDrpexaMB4frbVQOdS4DGseg=";

     

       9
       9
       +
           hash = "sha256-DLPew6pz+ABgdxSdHSX62VieRnTvbaj2sY3ujti1aj0=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         meta = with lib; {

+2 -2

pkgs/tools/graphics/adriconf/default.nix

···

       15
       15
        
       

     

       16
       16
        
       stdenv.mkDerivation rec {

     

       17
       17
        
         pname = "adriconf";

     

       18
       18
       -
         version = "2.5.0";

     

       18
       18
       +
         version = "2.5.1";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitLab {

     

       21
       21
        
           domain = "gitlab.freedesktop.org";

     

       22
       22
        
           owner = "mesa";

     

       23
       23
        
           repo = pname;

     

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

     

       25
       25
       -
           sha256 = "sha256-nxqrs8c1sRruZLwFwK/JfXQPfpEq08Pe2n7ojQkH3SM=";

     

       25
       25
       +
           sha256 = "sha256-RhHmrjb5TvJnZ6R0aefqdmwMBpu4iTrxSHru7JAwrgs=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [ cmake pkg-config ];

+4 -7

pkgs/tools/misc/fd/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "fd";

     

       5
       5
       -
         version = "8.5.3";

     

       5
       5
       +
         version = "8.6.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "sharkdp";

     

       9
       9
        
           repo = "fd";

     

       10
       10
       -
           # On the next release, go back to `rev = "v${version}";`

     

       11
       11
       -
           # The 8.5.3 release appears to have been mysteriously re-tagged:

     

       12
       12
       -
           # https://github.com/sharkdp/fd/issues/1184

     

       13
       13
       -
           rev = "f6e74407e80a5563a9e4d0530371aed281e05838";

     

       14
       14
       -
           sha256 = "sha256-7QQHLw+isXtr1FDQr4aiUhvOjJUPbaxFGDwukiWBG9g=";

     

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

     

       11
       11
       +
           sha256 = "sha256-RVGCSUYyWo2wKRIrnci+aWEAPW9jHhMfYkYJkCgd7f8=";

     

       15
       12
        
         };

     

       16
       13
        
       

     

       17
       17
       -
         cargoSha256 = "sha256-QFh47Pr+7lIdT++huziKgMJxvsZElTTwu11c7/wjyHE=";

     

       14
       14
       +
         cargoSha256 = "sha256-PT95U1l+BVX7sby3GKktZMmbNNQoPYR8nL+H90EnqZY=";

     

       18
       15
        
       

     

       19
       16
        
         auditable = true; # TODO: remove when this is the default

     

       20
       17

+3 -3

pkgs/tools/misc/procyon/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "procyon";

     

       5
       5
       -
         version = "0.6-prerelease";

     

       5
       5
       +
         version = "0.6.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
       -
           url = "https://github.com/mstrobel/procyon/releases/download/${version}/procyon-decompiler-${version}.jar";

     

       9
       9
       -
           sha256 = "sha256-eBVWKCo8ccAT/T9HgjxUCNFzGyzofc9Mbyp0ldUmrdk=";

     

       8
       8
       +
           url = "https://github.com/mstrobel/procyon/releases/download/v${version}/procyon-decompiler-${version}.jar";

     

       9
       9
       +
           sha256 = "sha256-gh2pYBL8aSRPoeopjJBFXuTgIUNLx5bTuVRqskYBt3k=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         dontUnpack = true;

+10 -6

pkgs/tools/networking/amass/default.nix

···

       1
       1
       -
       { buildGoModule

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildGoModule

     

       2
       3
        
       , fetchFromGitHub

     

       3
       3
       -
       , lib

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "amass";

     

       8
       8
       -
         version = "3.20.0";

     

       8
       8
       +
         version = "3.21.1";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "OWASP";

     

       12
       12
        
           repo = "Amass";

     

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

     

       14
       14
       -
           sha256 = "sha256-c6PAmCIxQEkLJi0PNS+8oO/q3lWS0ZSXMiOiExWRpgY=";

     

       14
       14
       +
           hash = "sha256-QHFMHAKAwPdVhCTLUFtRcX252kyHfLQNPOTJ1WwSLgU=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         vendorSha256 = "sha256-hoX/i3RIMhs2ssm1qELHKceS3Vzo6cj/eMuAROyz/mQ=";

     

       17
       17
       +
         vendorHash = "sha256-ytTHJoWjCiIoUJtUYUguphWVXr6gp43pY/L2ik2Bb+A=";

     

       18
       18
        
       

     

       19
       19
       -
         outputs = [ "out" "wordlists" ];

     

       19
       19
       +
         outputs = [

     

       20
       20
       +
           "out"

     

       21
       21
       +
           "wordlists"

     

       22
       22
       +
         ];

     

       20
       23
        
       

     

       21
       24
        
         postInstall = ''

     

       22
       25
        
           mkdir -p $wordlists

     
···

       41
       44
        
             that are found under the wordlists output.

     

       42
       45
        
             '';

     

       43
       46
        
           homepage = "https://owasp.org/www-project-amass/";

     

       47
       47
       +
           changelog = "https://github.com/OWASP/Amass/releases/tag/v${version}";

     

       44
       48
        
           license = licenses.asl20;

     

       45
       49
        
           maintainers = with maintainers; [ kalbasit fab ];

     

       46
       50
        
         };

+2 -2

pkgs/tools/networking/pritunl-client/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "pritunl-client";

     

       5
       5
       -
         version = "1.3.3343.50";

     

       5
       5
       +
         version = "1.3.3370.14";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "pritunl";

     

       9
       9
        
           repo = "pritunl-client-electron";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-xooTPJFtCIIQG8cibfqxGDTIzF2vjvmo8zteVNiHsGQ=";

     

       11
       11
       +
           sha256 = "sha256-/HXnD2P2fsNxWXMe5U7SUgxzOaHokktTogYIdiH8Kk8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         modRoot = "cli";

+17

pkgs/tools/security/modsecurity/Makefile.am.patch

···

       1
       1
       +
       --- a/apache2/Makefile.am

     

       2
       2
       +
       +++ b/apache2/Makefile.am

     

       3
       3
       +
       @@ -179,7 +179,6 @@ install-exec-hook: $(pkglib_LTLIBRARIES)

     

       4
       4
       +
        	for m in $(pkglib_LTLIBRARIES); do \

     

       5
       5
       +
        	  base=`echo $$m | sed 's/\..*//'`; \

     

       6
       6
       +
        	  rm -f $(DESTDIR)$(pkglibdir)/$$base.*a; \

     

       7
       7
       +
       -	  install -D -m444 $(DESTDIR)$(pkglibdir)/$$base.so $(DESTDIR)$(APXS_MODULES)/$$base.so; \

     

       8
       8
       +
        	done

     

       9
       9
       +
        else

     

       10
       10
       +
        install-exec-hook: $(pkglib_LTLIBRARIES)

     

       11
       11
       +
       @@ -187,6 +186,5 @@ install-exec-hook: $(pkglib_LTLIBRARIES)

     

       12
       12
       +
        	for m in $(pkglib_LTLIBRARIES); do \

     

       13
       13
       +
        	  base=`echo $$m | sed 's/\..*//'`; \

     

       14
       14
       +
        	  rm -f $(DESTDIR)$(pkglibdir)/$$base.*a; \

     

       15
       15
       +
       -	  cp -p $(DESTDIR)$(pkglibdir)/$$base.so $(DESTDIR)$(APXS_MODULES); \

     

       16
       16
       +
        	done

     

       17
       17
       +
        endif

-17

pkgs/tools/security/modsecurity/Makefile.in.patch

···

       1
       1
       -
       --- a/apache2/Makefile.in	2017-10-10 09:45:51.000000000 -0400

     

       2
       2
       -
       +++ b/apache2/Makefile.in	2017-10-10 09:46:04.000000000 -0400

     

       3
       3
       -
       @@ -1208,14 +1208,12 @@

     

       4
       4
       -
        @LINUX_TRUE@	for m in $(pkglib_LTLIBRARIES); do \

     

       5
       5
       -
        @LINUX_TRUE@	  base=`echo $$m | sed 's/\..*//'`; \

     

       6
       6
       -
        @LINUX_TRUE@	  rm -f $(DESTDIR)$(pkglibdir)/$$base.*a; \

     

       7
       7
       -
       -@LINUX_TRUE@	  install -D -m444 $(DESTDIR)$(pkglibdir)/$$base.so $(DESTDIR)$(APXS_MODULES)/$$base.so; \

     

       8
       8
       -
        @LINUX_TRUE@	done

     

       9
       9
       -
        @LINUX_FALSE@install-exec-hook: $(pkglib_LTLIBRARIES)

     

       10
       10
       -
        @LINUX_FALSE@	@echo "Removing unused static libraries..."; \

     

       11
       11
       -
        @LINUX_FALSE@	for m in $(pkglib_LTLIBRARIES); do \

     

       12
       12
       -
        @LINUX_FALSE@	  base=`echo $$m | sed 's/\..*//'`; \

     

       13
       13
       -
        @LINUX_FALSE@	  rm -f $(DESTDIR)$(pkglibdir)/$$base.*a; \

     

       14
       14
       -
       -@LINUX_FALSE@	  cp -p $(DESTDIR)$(pkglibdir)/$$base.so $(DESTDIR)$(APXS_MODULES); \

     

       15
       15
       -
        @LINUX_FALSE@	done

     

       16
       16
       -
        

     

       17
       17
       -
        # Tell versions [3.59,3.63) of GNU make to not export all variables.

+13 -8

pkgs/tools/security/modsecurity/default.nix

···

       1
       1
       -
       { stdenv, lib, fetchurl, pkg-config

     

       1
       1
       +
       { stdenv, lib, fetchFromGitHub, pkg-config, autoreconfHook

     

       2
       2
        
       , curl, apacheHttpd, pcre, apr, aprutil, libxml2

     

       3
       3
       -
       , luaSupport ? false, lua5

     

       3
       3
       +
       , luaSupport ? false, lua5, perl

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       with lib;

     
···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "modsecurity";

     

       14
       14
       -
         version = "2.9.3";

     

       14
       14
       +
         version = "2.9.6";

     

       15
       15
        
       

     

       16
       16
       -
         src = fetchurl {

     

       17
       17
       -
           url = "https://www.modsecurity.org/tarball/${version}/${pname}-${version}.tar.gz";

     

       18
       18
       -
           sha256 = "0611nskd2y6yagrciqafxdn4rxbdk2v4swf45kc1sgwx2sfh34j1";

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "SpiderLabs";

     

       18
       18
       +
           repo = pname;

     

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

     

       20
       20
       +
           sha256 = "sha256-C/D/UWaI4GsXjfhLmNnYhRJoUvlsps1551SqhmZUc/4=";

     

       19
       21
        
         };

     

       20
       22
        
       

     

       21
       21
       -
         nativeBuildInputs = [ pkg-config ];

     

       23
       23
       +
         nativeBuildInputs = [ pkg-config autoreconfHook ];

     

       22
       24
        
         buildInputs = [  curl apacheHttpd pcre apr aprutil libxml2 ] ++

     

       23
       25
        
           optional luaSupport lua5;

     

       24
       26
        
       

     
···

       37
       39
        
         outputs = ["out" "nginx"];

     

       38
       40
        
         # by default modsecurity's install script copies compiled output to httpd's modules folder

     

       39
       41
        
         # this patch removes those lines

     

       40
       40
       -
         patches = [ ./Makefile.in.patch ];

     

       42
       42
       +
         patches = [ ./Makefile.am.patch ];

     

       43
       43
       +
       

     

       44
       44
       +
         doCheck = true;

     

       45
       45
       +
         checkInputs = [ perl ];

     

       41
       46
        
       

     

       42
       47
        
         postInstall = ''

     

       43
       48
        
           mkdir -p $nginx

+1

pkgs/tools/typesetting/satysfi/default.nix

···

       17
       17
        
             rev = "v0.3.7+satysfi";

     

       18
       18
        
             sha256 = "0y8s0ij1vp1s4h5y1hn3ns76fzki2ba5ysqdib33akdav9krbj8p";

     

       19
       19
        
           };

     

       20
       20
       +
           propagatedBuildInputs = o.propagatedBuildInputs ++ [ ocamlPackages.result ];

     

       20
       21
        
         });

     

       21
       22
        
         yojson-with-position = ocamlPackages.buildDunePackage {

     

       22
       23
        
           pname = "yojson-with-position";

+36

pkgs/tools/wayland/wpaperd/default.nix

···

       1
       1
       +
       { lib, rustPlatform, fetchFromGitHub, pkg-config, libxkbcommon }:

     

       2
       2
       +
       

     

       3
       3
       +
       rustPlatform.buildRustPackage rec {

     

       4
       4
       +
         pname = "wpaperd";

     

       5
       5
       +
         version = "0.2.0";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "danyspin97";

     

       9
       9
       +
           repo = pname;

     

       10
       10
       +
           rev = version;

     

       11
       11
       +
           sha256 = "n1zlC2afog0UazsJEBAzXpnhVDeP3xqpNGXlJ65umHQ=";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         nativeBuildInputs = [

     

       15
       15
       +
           pkg-config

     

       16
       16
       +
         ];

     

       17
       17
       +
         buildInputs = [

     

       18
       18
       +
           libxkbcommon

     

       19
       19
       +
         ];

     

       20
       20
       +
       

     

       21
       21
       +
         cargoSha256 = "8ZMdbJvedDqoDr2rhKM1TMB5N4aRde04x/9H212fe68=";

     

       22
       22
       +
       

     

       23
       23
       +
         meta = with lib; {

     

       24
       24
       +
           description = "Minimal wallpaper daemon for Wayland";

     

       25
       25
       +
           longDescription = ''

     

       26
       26
       +
             It allows the user to choose a different image for each output (aka for each monitor)

     

       27
       27
       +
             just as swaybg. Moreover, a directory can be chosen and wpaperd will randomly choose

     

       28
       28
       +
             an image from it. Optionally, the user can set a duration, after which the image

     

       29
       29
       +
             displayed will be changed with another random one.

     

       30
       30
       +
           '';

     

       31
       31
       +
           homepage = "https://github.com/danyspin97/wpaperd";

     

       32
       32
       +
           license = licenses.gpl3Plus;

     

       33
       33
       +
           platforms = platforms.linux;

     

       34
       34
       +
           maintainers = with maintainers; [ DPDmancul ];

     

       35
       35
       +
         };

     

       36
       36
       +
       }

+10 -9

pkgs/top-level/all-packages.nix

···

       185
       185
        
           meta.platforms = lib.platforms.linux;

     

       186
       186
        
         } ../build-support/setup-hooks/auto-patchelf.sh;

     

       187
       187
        
       

     

       188
       188
       -
         appflowy = callPackage ../applications/office/appflowy {

     

       189
       189
       -
           openssl = openssl_1_1;

     

       190
       190
       -
         };

     

       188
       188
       +
         appflowy = callPackage ../applications/office/appflowy { };

     

       191
       189
        
       

     

       192
       190
        
         appimageTools = callPackage ../build-support/appimage {

     

       193
       191
        
           buildFHSUserEnv = buildFHSUserEnvBubblewrap;

     
···

       3304
       3302
        
       

     

       3305
       3303
        
         plausible = callPackage ../servers/web-apps/plausible { };

     

       3306
       3304
        
       

     

       3305
       3305
       +
         pam-reattach = callPackage ../os-specific/darwin/pam-reattach {};

     

       3306
       3306
       +
       

     

       3307
       3307
        
         reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {};

     

       3308
       3308
        
       

     

       3309
       3309
        
         skhd = callPackage ../os-specific/darwin/skhd {

     
···

       4000
       4000
        
         wluma = callPackage ../tools/wayland/wluma {  };

     

       4001
       4001
        
       

     

       4002
       4002
        
         wob = callPackage ../tools/wayland/wob { };

     

       4003
       4003
       +
       

     

       4004
       4004
       +
         wpaperd = callPackage ../tools/wayland/wpaperd { };

     

       4003
       4005
        
       

     

       4004
       4006
        
         wshowkeys = callPackage ../tools/wayland/wshowkeys { };

     

       4005
       4007
        
       

     
···

       15379
       15381
        
         };

     

       15380
       15382
        
         cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { };

     

       15381
       15383
        
         cargo-sync-readme = callPackage ../development/tools/rust/cargo-sync-readme {};

     

       15382
       15382
       -
         cargo-tally = callPackage ../development/tools/rust/cargo-tally {

     

       15383
       15383
       -
           inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit;

     

       15384
       15384
       -
         };

     

       15384
       15384
       +
         cargo-tally = callPackage ../development/tools/rust/cargo-tally { };

     

       15385
       15385
        
         cargo-temp = callPackage ../development/tools/rust/cargo-temp { };

     

       15386
       15386
        
         cargo-udeps = callPackage ../development/tools/rust/cargo-udeps {

     

       15387
       15387
        
           inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;

     
···

       32809
       32809
        
         wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped);

     

       32810
       32810
        
         neovim-unwrapped = callPackage ../applications/editors/neovim {

     

       32811
       32811
        
           CoreServices =  darwin.apple_sdk.frameworks.CoreServices;

     

       32812
       32812
       -
           lua = luajit;

     

       32812
       32812
       +
           lua = if (stdenv.hostPlatform.isRiscV64 || stdenv.hostPlatform.isRiscV64) then lua5_1 else luajit;

     

       32813
       32813
        
         };

     

       32814
       32814
        
       

     

       32815
       32815
        
         neovimUtils = callPackage ../applications/editors/neovim/utils.nix {

     
···

       34823
       34823
        
         # You still can override by passing more arguments.

     

       34824
       34824
        
         space-orbit = callPackage ../games/space-orbit { };

     

       34825
       34825
        
       

     

       34826
       34826
       -
         spring = callPackage ../games/spring

     

       34827
       34827
       -
           { stdenv = gcc10StdenvCompat; asciidoc = asciidoc-full; };

     

       34826
       34826
       +
         spring = callPackage ../games/spring { asciidoc = asciidoc-full; };

     

       34828
       34827
        
       

     

       34829
       34828
        
         springLobby = callPackage ../games/spring/springlobby.nix { };

     

       34830
       34829
        
       

     
···

       38190
       38189
        
         aitrack = libsForQt5.callPackage ../applications/misc/aitrack { };

     

       38191
       38190
        
       

     

       38192
       38191
        
         widevine-cdm = callPackage ../applications/networking/browsers/misc/widevine-cdm.nix { };

     

       38192
       38192
       +
       

     

       38193
       38193
       +
         alsa-scarlett-gui = callPackage ../applications/audio/alsa-scarlett-gui { };

     

       38193
       38194
        
       }

+2 -4

pkgs/top-level/python-packages.nix

···

       1508
       1508
        
       

     

       1509
       1509
        
         caldav = callPackage ../development/python-modules/caldav { };

     

       1510
       1510
        
       

     

       1511
       1511
       +
         calver = callPackage ../development/python-modules/calver { };

     

       1512
       1512
       +
       

     

       1511
       1513
        
         callee = callPackage ../development/python-modules/callee { };

     

       1512
       1514
        
       

     

       1513
       1515
        
         calmjs-parse = callPackage ../development/python-modules/calmjs-parse { };

     
···

       6878
       6880
        
       

     

       6879
       6881
        
         pandas-stubs = callPackage ../development/python-modules/pandas-stubs { };

     

       6880
       6882
        
       

     

       6881
       6881
       -
         parameterizedtestcase = callPackage ../development/python-modules/parameterizedtestcase { };

     

       6882
       6882
       -
       

     

       6883
       6883
        
         pdunehd = callPackage ../development/python-modules/pdunehd { };

     

       6884
       6884
        
       

     

       6885
       6885
        
         pencompy = callPackage ../development/python-modules/pencompy { };

     
···

       7908
       7908
        
         pygmo = callPackage ../development/python-modules/pygmo { };

     

       7909
       7909
        
       

     

       7910
       7910
        
         pygmt = callPackage ../development/python-modules/pygmt { };

     

       7911
       7911
       -
       

     

       7912
       7912
       -
         pygobject2 = callPackage ../development/python-modules/pygobject { };

     

       7913
       7911
        
       

     

       7914
       7912
        
         pygobject3 = callPackage ../development/python-modules/pygobject/3.nix {

     

       7915
       7913
        
           # inherit (pkgs) meson won't work because it won't be spliced

+1 -44

pkgs/top-level/python2-packages.nix

···

       9
       9
        
       

     

       10
       10
        
         bootstrapped-pip = toPythonModule (callPackage ../development/python2-modules/bootstrapped-pip { });

     

       11
       11
        
       

     

       12
       12
       -
         boto3 = callPackage ../development/python2-modules/boto3 {};

     

       13
       13
       -
       

     

       14
       14
       -
         botocore = callPackage ../development/python2-modules/botocore {};

     

       15
       15
       -
       

     

       16
       16
       -
         certifi = callPackage ../development/python2-modules/certifi { };

     

       17
       17
       -
       

     

       18
       12
        
         cffi = callPackage ../development/python2-modules/cffi { inherit cffi; };

     

       19
       13
        
       

     

       20
       20
       -
         chardet = callPackage ../development/python2-modules/chardet { };

     

       21
       21
       -
       

     

       22
       14
        
         configparser = callPackage ../development/python2-modules/configparser { };

     

       23
       15
        
       

     

       24
       16
        
         contextlib2 = callPackage ../development/python2-modules/contextlib2 { };

     
···

       30
       22
        
         filelock =  callPackage ../development/python2-modules/filelock { };

     

       31
       23
        
       

     

       32
       24
        
         futures = callPackage ../development/python2-modules/futures { };

     

       33
       33
       -
       

     

       34
       34
       -
         google-apputils = callPackage ../development/python2-modules/google-apputils { };

     

       35
       35
       -
       

     

       36
       36
       -
         gtkme = callPackage ../development/python2-modules/gtkme { };

     

       37
       25
        
       

     

       38
       26
        
         hypothesis = callPackage ../development/python2-modules/hypothesis { };

     

       39
       27
        
       

     

       40
       40
       -
         idna = callPackage ../development/python2-modules/idna { };

     

       41
       41
       -
       

     

       42
       28
        
         importlib-metadata = callPackage ../development/python2-modules/importlib-metadata { };

     

       43
       29
        
       

     

       44
       30
        
         jinja2 = callPackage ../development/python2-modules/jinja2 { };

     

       45
       45
       -
       

     

       46
       46
       -
         marisa = callPackage ../development/python2-modules/marisa {

     

       47
       47
       -
           inherit (pkgs) marisa;

     

       48
       48
       -
         };

     

       49
       31
        
       

     

       50
       32
        
         markupsafe = callPackage ../development/python2-modules/markupsafe { };

     

       51
       33
        
       

     
···

       58
       40
        
         pip = callPackage ../development/python2-modules/pip { };

     

       59
       41
        
       

     

       60
       42
        
         pluggy = callPackage ../development/python2-modules/pluggy { };

     

       61
       61
       -
       

     

       62
       62
       -
         protobuf = callPackage ../development/python2-modules/protobuf {

     

       63
       63
       -
           disabled = isPyPy;

     

       64
       64
       -
           protobuf = pkgs.protobuf3_17; # last version compatible with Python 2

     

       65
       65
       -
         };

     

       66
       43
        
       

     

       67
       44
        
         pycairo = callPackage ../development/python2-modules/pycairo {

     

       68
       45
        
           inherit (pkgs.buildPackages) meson;

     

       69
       46
        
         };

     

       70
       47
        
       

     

       71
       71
       -
         pygments = callPackage ../development/python2-modules/Pygments { };

     

       72
       72
       -
       

     

       73
       73
       -
         pygobject3 = callPackage ../development/python2-modules/pygobject {

     

       74
       74
       -
           inherit (pkgs) meson;

     

       75
       75
       -
         };

     

       48
       48
       +
         pygobject2 = callPackage ../development/python2-modules/pygobject { };

     

       76
       49
        
       

     

       77
       50
        
         pygtk = callPackage ../development/python2-modules/pygtk { };

     

       78
       51
        
       

     

       79
       52
        
         pyparsing = callPackage ../development/python2-modules/pyparsing { };

     

       80
       53
        
       

     

       81
       81
       -
         pyroma = callPackage ../development/python2-modules/pyroma { };

     

       82
       82
       -
       

     

       83
       83
       -
         pysqlite = callPackage ../development/python2-modules/pysqlite { };

     

       84
       84
       -
       

     

       85
       54
        
         pytest = pytest_4;

     

       86
       55
        
       

     

       87
       56
        
         pytest_4 = callPackage

     
···

       92
       61
        
             };

     

       93
       62
        
           };

     

       94
       63
        
       

     

       95
       95
       -
         pytest-runner = callPackage ../development/python2-modules/pytest-runner { };

     

       96
       96
       -
       

     

       97
       64
        
         pytest-xdist = callPackage ../development/python2-modules/pytest-xdist { };

     

       98
       65
        
       

     

       99
       66
        
         recoll = disabled super.recoll;

     
···

       102
       69
        
       

     

       103
       70
        
         rpm = disabled super.rpm;

     

       104
       71
        
       

     

       105
       105
       -
         s3transfer = callPackage ../development/python2-modules/s3transfer { };

     

       106
       106
       -
       

     

       107
       107
       -
         scandir = callPackage ../development/python2-modules/scandir { };

     

       108
       108
       -
       

     

       109
       72
        
         sequoia = disabled super.sequoia;

     

       110
       73
        
       

     

       111
       74
        
         setuptools = callPackage ../development/python2-modules/setuptools { };

     

       112
       75
        
       

     

       113
       76
        
         setuptools-scm = callPackage ../development/python2-modules/setuptools-scm { };

     

       114
       114
       -
       

     

       115
       115
       -
         sphinxcontrib-websupport = callPackage ../development/python2-modules/sphinxcontrib-websupport { };

     

       116
       116
       -
       

     

       117
       117
       -
         sphinx = callPackage ../development/python2-modules/sphinx { };

     

       118
       118
       -
       

     

       119
       119
       -
         typing = callPackage ../development/python2-modules/typing { };

     

       120
       77
        
       

     

       121
       78
        
         zeek = disabled super.zeek;

     

       122
       79