diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-12-10 16:19:36 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-12-10 16:19:36 +0100 |
| commit | de033ae75a79861108d4203ffdf2df4ed09c618b (patch) | |
| tree | 9a61f37a5794f98a4ef7773ff77e87ec0d259681 | |
| parent | 7561ba5987b928c47ac2ffee8468e62940881b4f (diff) | |
| parent | 60aa3fa6d7bc6ebbd1ad704ef8b3dbd28a115ae3 (diff) | |
| download | nixlib-de033ae75a79861108d4203ffdf2df4ed09c618b.tar nixlib-de033ae75a79861108d4203ffdf2df4ed09c618b.tar.gz nixlib-de033ae75a79861108d4203ffdf2df4ed09c618b.tar.bz2 nixlib-de033ae75a79861108d4203ffdf2df4ed09c618b.tar.lz nixlib-de033ae75a79861108d4203ffdf2df4ed09c618b.tar.xz nixlib-de033ae75a79861108d4203ffdf2df4ed09c618b.tar.zst nixlib-de033ae75a79861108d4203ffdf2df4ed09c618b.zip | |
Merge branch 'master' into staging-next
94 files changed, 466 insertions, 1138 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 21e53a2ecc94..39b94a5e75b4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3704,6 +3704,12 @@ fingerprint = "4749 0887 CF3B 85A1 6355 C671 78C7 DD40 DF23 FB16"; }]; }; + DPDmancul = { + name = "Davide Peressoni"; + email = "davide.peressoni@tuta.io"; + matrix = "@dpd-:matrix.org"; + githubId = 3186857; + }; dpercy = { email = "dpercy@dpercy.dev"; github = "dpercy"; diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix index cc2ca6314433..87ac53a60b7e 100644 --- a/nixos/modules/config/zram.nix +++ b/nixos/modules/config/zram.nix @@ -132,6 +132,8 @@ in options zram num_devices=${toString cfg.numDevices} ''; + boot.kernelParams = ["zram.num_devices=${toString cfg.numDevices}"]; + services.udev.extraRules = '' KERNEL=="zram[0-9]*", ENV{SYSTEMD_WANTS}="zram-init-%k.service", TAG+="systemd" ''; @@ -178,9 +180,9 @@ in serviceConfig = { Type = "oneshot"; RemainAfterExit = true; - ExecStartPre = "${modprobe} -r zram"; - ExecStart = "${modprobe} zram"; - ExecStop = "${modprobe} -r zram"; + ExecStartPre = "-${modprobe} -r zram"; + ExecStart = "-${modprobe} zram"; + ExecStop = "-${modprobe} -r zram"; }; restartTriggers = [ cfg.numDevices diff --git a/nixos/modules/programs/firejail.nix b/nixos/modules/programs/firejail.nix index a98c15a04517..6f79c13d94b4 100644 --- a/nixos/modules/programs/firejail.nix +++ b/nixos/modules/programs/firejail.nix @@ -8,18 +8,21 @@ let wrappedBins = pkgs.runCommand "firejail-wrapped-binaries" { preferLocalBuild = true; allowSubstitutes = false; + # take precedence over non-firejailed versions + meta.priority = -1; } '' mkdir -p $out/bin + mkdir -p $out/share/applications ${lib.concatStringsSep "\n" (lib.mapAttrsToList (command: value: let opts = if builtins.isAttrs value then value - else { executable = value; profile = null; extraArgs = []; }; + else { executable = value; desktop = null; profile = null; extraArgs = []; }; args = lib.escapeShellArgs ( opts.extraArgs ++ (optional (opts.profile != null) "--profile=${toString opts.profile}") - ); + ); in '' cat <<_EOF >$out/bin/${command} @@ -27,6 +30,11 @@ let exec /run/wrappers/bin/firejail ${args} -- ${toString opts.executable} "\$@" _EOF chmod 0755 $out/bin/${command} + + ${lib.optionalString (opts.desktop != null) '' + substitute ${opts.desktop} $out/share/applications/$(basename ${opts.desktop}) \ + --replace ${opts.executable} $out/bin/${command} + ''} '') cfg.wrappedBinaries)} ''; @@ -42,6 +50,12 @@ in { description = lib.mdDoc "Executable to run sandboxed"; example = literalExpression ''"''${lib.getBin pkgs.firefox}/bin/firefox"''; }; + desktop = mkOption { + type = types.nullOr types.path; + default = null; + description = lib.mkDoc ".desktop file to modify. Only necessary if it uses the absolute path to the executable."; + example = literalExpression ''"''${pkgs.firefox}/share/applications/firefox.desktop"''; + }; profile = mkOption { type = types.nullOr types.path; default = null; @@ -71,12 +85,6 @@ in { ''; description = lib.mdDoc '' Wrap the binaries in firejail and place them in the global path. - - You will get file collisions if you put the actual application binary in - the global environment (such as by adding the application package to - `environment.systemPackages`), and applications started via - .desktop files are not wrapped if they specify the absolute path to the - binary. ''; }; }; diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index 35b96734be77..a6cd7432db24 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -658,8 +658,9 @@ in { recommendedProxySettings = true; # required for redirections to work virtualHosts."${cfg.localDomain}" = { root = "${cfg.package}/public/"; - forceSSL = true; # mastodon only supports https - enableACME = true; + # mastodon only supports https, but you can override this if you offload tls elsewhere. + forceSSL = lib.mkDefault true; + enableACME = lib.mkDefault true; locations."/system/".alias = "/var/lib/mastodon/public-system/"; diff --git a/pkgs/applications/audio/alsa-scarlett-gui/default.nix b/pkgs/applications/audio/alsa-scarlett-gui/default.nix new file mode 100644 index 000000000000..8365532b7c13 --- /dev/null +++ b/pkgs/applications/audio/alsa-scarlett-gui/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, alsa-lib +, gtk4 +, wrapGAppsHook4 +}: + +stdenv.mkDerivation rec { + pname = "alsa-scarlett-gui"; + version = "unstable-2022-08-11"; + + src = fetchFromGitHub { + owner = "geoffreybennett"; + repo = pname; + rev = "65c0f6aa432501355803a823be1d3f8aafe907a8"; + sha256 = "sha256-wzBOPTs8PTHzu5RpKwKhx552E7QnDx2Zn4OFaes8Q2I="; + }; + + makeFlags = [ "DESTDIR=\${out}" "PREFIX=''" ]; + sourceRoot = "source/src"; + nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; + buildInputs = [ gtk4 alsa-lib ]; + + meta = with lib; { + description = "GUI for alsa controls presented by Focusrite Scarlett Gen 2/3 Mixer Driver"; + homepage = "https://github.com/geoffreybennett/alsa-scarlett-gui"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ sebtm ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index d3ee3ea9a030..78e00655ad3e 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -4,13 +4,13 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy"; rev = "refs/tags/v${version}"; - sha256 = "sha256-cr4v1ScrXLRjqlsCXTm0KvLc+jJbFX1HVKJLrDAtIw8="; + sha256 = "sha256-IUQe5WH2vsrAOgokhTNVVM3lnJXphT2xNGu27hWBLSo="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index d40a57323a13..7a667b187566 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -7,7 +7,6 @@ , glib , gtk3 , libnotify -, scandir ? null }: python3Packages.buildPythonApplication rec { @@ -37,7 +36,6 @@ python3Packages.buildPythonApplication rec { chardet pygobject3 requests - scandir ]; # Patch the many hardcoded uses of /usr/share/ and /usr/bin diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index 35832b0dafb1..4366576ccbbe 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.2.7"; + version = "2.2.8"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = pname; rev = "v${version}"; - hash = "sha256-Kqvnw0cPPkqgJQdc6vkP4U96AQuyFSNMQTzTdIUghWw="; + hash = "sha256-646jGcgcEbhHk3PWdkKHWLVX8bNIB3BmYVMoXaGxHUw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index 4812f69f34e8..66188f174753 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "luakit"; - version = "2.3.1"; + version = "2.3.3"; src = fetchFromGitHub { owner = "luakit"; repo = pname; rev = version; - hash = "sha256-6baN3e5ZJ8hw6mhQ0AapyVIYFSdmXcfo45ReQNliIPw="; + hash = "sha256-DtoixcLq+ddbacTAo+Qq6q4k1i6thirACw1zqUeOxXo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6fc1405b7067..fca7beb8c009 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -103,11 +103,11 @@ "vendorHash": "sha256-yDkox74g0N8iniWHSNk6KjfM0HJa8H2HUxm6RxrdhkE=" }, "aviatrix": { - "hash": "sha256-1zHaSdDcGynLhgLMDRbRgRzt0IvQI25TDZrYzZwwQ34=", + "hash": "sha256-2KJVXIThZ3g1++y5fhKLQjeXZ9r685B8stmWfs2MAs0=", "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix", "owner": "AviatrixSystems", "repo": "terraform-provider-aviatrix", - "rev": "v2.24.1", + "rev": "v3.0.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -130,11 +130,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-2RjraGiMtITdBJ47crqlqFR51WbKpk4U6fkGHCTNXuo=", + "hash": "sha256-GNp4Am/ooMm//LGMMxJlMxQIh4rHmQdnpVEYZn3Hjb8=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.34.0", + "rev": "v3.35.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -424,11 +424,11 @@ "vendorHash": "sha256-cStVmI58V46I3MYYYrbCY3llnOx2pyuM2Ku+rhe5DVQ=" }, "github": { - "hash": "sha256-1C/GG3VhQfnU71rucYefpRsfrS//lpPXHqT/QAHM2z0=", + "hash": "sha256-o7Sge0rCfP6Yueq+DP7siBsEinawgGe+nEu0/Olu8uQ=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.11.0", + "rev": "v5.12.0", "spdx": "MIT", "vendorHash": null }, @@ -507,11 +507,11 @@ "vendorHash": null }, "heroku": { - "hash": "sha256-GmrzvE1Wc1dQSlEL4mLYHIkAVxKwElx2fCWkrnZra18=", + "hash": "sha256-6SNBi4hSGD6XhUSmIOjmPVzo2HnvRBGFW1jMHJLDhuI=", "homepage": "https://registry.terraform.io/providers/heroku/heroku", "owner": "heroku", "repo": "terraform-provider-heroku", - "rev": "v5.1.8", + "rev": "v5.1.9", "spdx": "MPL-2.0", "vendorHash": null }, @@ -734,13 +734,13 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "minio": { - "hash": "sha256-mtguRBSa+XrpUqEXb9voDHraae9fOaayX1nQpaeAlo4=", + "hash": "sha256-QMaK/c4Rv7rChiVVGY8JizqTfLY98HwONyu5qU/LPGQ=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v1.9.1", + "rev": "v1.10.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-VxISNcWEnBAa+8WsmqxcT+DPF74X8rLlvdSNJtx0++I=" + "vendorHash": "sha256-w/1eNrXK4Zpt80J1FidnhMAD0lhSskHMt/hrdrgfSYw=" }, "mongodbatlas": { "hash": "sha256-QMwsVD1RZwL9DPF0gnio4quqUa1b4G0SK73yd6BYnG4=", diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 56f58e3e566c..05eff6e82e59 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,8 +2,8 @@ let versions = if stdenv.isLinux then { stable = "0.0.21"; - ptb = "0.0.35"; - canary = "0.0.144"; + ptb = "0.0.38"; + canary = "0.0.145"; } else { stable = "0.0.264"; ptb = "0.0.59"; @@ -18,11 +18,11 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "bnp5wfcR21s7LMPxFgj5G3UsxPWlFj4t6CbeosiufHY="; + sha256 = "bPg7ZNQQxEpRSpp8j5/XLBDEJyId8mDGxS6tqkzzI1s="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-/le3YT8djSj60H+Pq1qUxqc8CNgEZladOeFa9D2ZGl8="; + sha256 = "sha256-TF+7SnCTsbh+Z8AeEESEFVLSpD3c5HOAwpU1UBuB1BU="; }; }; x86_64-darwin = { diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 30376e57da79..f2d368af612f 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.6.2"; + version = "3.6.4"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-eTcQrbYYY+V87i6PuIEWCFczIqL8oxtdojPY/mZpJBU="; + sha256 = "sha256-ZtDgm9xlBQflVXsxjt4bFmRby6ni0wjaGYaoiEWH9Q0="; }; patches = [ @@ -82,6 +82,7 @@ mkDerivation rec { ]; cmakeFlags = [ + "-DBUILD_UPDATER=off" "-DCMAKE_INSTALL_LIBDIR=lib" # expected to be prefix-relative by build code setting RPATH "-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit ]; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 3cf59928ca90..2bb2967ec745 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -16,6 +16,7 @@ , miniupnpc , dht , libnatpmp +, libiconv # Build options , enableGTK3 ? false , gtk3 @@ -93,7 +94,7 @@ in stdenv.mkDerivation { ++ lib.optionals enableGTK3 [ gtk3 xorg.libpthreadstubs ] ++ lib.optionals enableSystemd [ systemd ] ++ lib.optionals stdenv.isLinux [ inotify-tools ] - ; + ++ lib.optionals stdenv.isDarwin [ libiconv ]; postInstall = '' mkdir $apparmor diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index f134474006ec..96d0c60df146 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,28 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit }: stdenv.mkDerivation rec { pname = "pjsip"; - version = "2.12.1"; + version = "2.13"; src = fetchFromGitHub { owner = pname; repo = "pjproject"; rev = version; - sha256 = "sha256-HIDL4xzzTu3irzrIOf8qSNCAvHGOMpi8EDeqZb8mMnc="; + sha256 = "sha256-yzszmm3uIyXtYFgZtUP3iswLx4u/8UbFt80Ln25ToFE="; }; patches = [ ./fix-aarch64.patch - (fetchpatch { - name = "CVE-2022-39269.patch"; - url = "https://github.com/pjsip/pjproject/commit/d2acb9af4e27b5ba75d658690406cec9c274c5cc.patch"; - sha256 = "sha256-bKE/MrRAqN1FqD2ubhxIOOf5MgvZluHHeVXPjbR12iQ="; - }) - (fetchpatch { - name = "CVE-2022-39244.patch"; - url = "https://github.com/pjsip/pjproject/commit/c4d34984ec92b3d5252a7d5cddd85a1d3a8001ae.patch"; - sha256 = "sha256-hTUMh6bYAizn6GF+sRV1vjKVxSf9pnI+eQdPOqsdJI4="; - }) ]; buildInputs = [ openssl libsamplerate ] diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 1b09de85bb36..a939cb5739e1 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -1,35 +1,35 @@ -{ stdenv, - lib, - fetchzip, - autoPatchelfHook, - makeWrapper, - copyDesktopItems, - makeDesktopItem, - gtk3, - openssl, - xdg-user-dirs, - keybinder3 +{ stdenv +, lib +, fetchzip +, autoPatchelfHook +, makeWrapper +, copyDesktopItems +, makeDesktopItem +, gtk3 +, openssl +, xdg-user-dirs +, keybinder3 }: stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.0.6.2"; + version = "0.0.8"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-linux-x86.tar.gz"; - sha256 = "sha256-LOrXGFctAaiz2z9M8ghrXsQ+qygwNPyYragmL/EjlDQ="; + sha256 = "sha256-+nizRA42c0ZzuN8D/puh0TFLnRJVgyAujcTmJZ1UVzo="; }; nativeBuildInputs = [ - autoPatchelfHook - makeWrapper - copyDesktopItems + autoPatchelfHook + makeWrapper + copyDesktopItems ]; buildInputs = [ - gtk3 - openssl - keybinder3 + gtk3 + openssl + keybinder3 ]; dontBuild = true; @@ -47,15 +47,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - preFixup = let - binPath = lib.makeBinPath [ - xdg-user-dirs - ]; - in '' + preFixup = '' # Add missing libraries to appflowy using the ones it comes with makeWrapper $out/opt/app_flowy $out/bin/appflowy \ - --set LD_LIBRARY_PATH "$out/opt/lib/" \ - --prefix PATH : "${binPath}" + --set LD_LIBRARY_PATH "$out/opt/lib/" \ + --prefix PATH : "${lib.makeBinPath [ xdg-user-dirs ]}" ''; desktopItems = [ diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index c08e68cc28a1..b85681a73cd9 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "git-bug"; - version = "0.7.2"; # the `rev` below pins the version of the source to get - rev = "cc4a93c8ce931b1390c61035b888ad17110b7bd6"; + version = "0.8.0"; # the `rev` below pins the version of the source to get + rev = "v0.8.0"; src = fetchFromGitHub { inherit rev; owner = "MichaelMure"; repo = "git-bug"; - sha256 = "0r6wh0y1fj3d3fbbrzq5n9k6z94xvwqww3xfbslkgyrin5bmziiq"; + sha256 = "12byf6nsamwz0ssigan1z299s01cyh8bhgj86bibl90agd4zs9n8"; }; - vendorSha256 = "15hhsrwwjc4krfc2d0r15lys3vr9rb9xk62pan4jr9ycbv0dny90"; + vendorSha256 = "sha256-32kNDoBE50Jx1Ef9YwhDk7nd3CaTSnHPlu7PgWPUGfE="; doCheck = false; @@ -23,9 +23,14 @@ buildGoModule rec { ]; postInstall = '' - install -D -m 0644 misc/bash_completion/git-bug "$out/share/bash-completion/completions/git-bug" - install -D -m 0644 misc/zsh_completion/git-bug "$out/share/zsh/site-functions/git-bug" + install -D -m 0644 misc/completion/bash/git-bug "$out/share/bash-completion/completions/git-bug" + install -D -m 0644 misc/completion/zsh/git-bug "$out/share/zsh/site-functions/git-bug" install -D -m 0644 -t "$out/share/man/man1" doc/man/* + + # not sure why the following executables are in $out/bin/ + rm -f $out/bin/cmd + rm -f $out/bin/completion + rm -f $out/bin/doc ''; meta = with lib; { diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index 3c92a93851bf..20edc2af502b 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, ocamlPackages, gnome2, pkg-config, makeWrapper, glib -, libtool, libpng, bison, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw +, libtool, libpng, bison, expat, fontconfig, gd, pango, libjpeg, libwebp, libX11, libXaw }: # We need an old version of Graphviz for format compatibility reasons. # This version is vulnerable, but monotone-viz will never feed it bad input. let graphviz_2_0 = import ./graphviz-2.0.nix { - inherit lib stdenv fetchurl pkg-config xlibsWrapper libpng libjpeg expat libXaw + inherit lib stdenv fetchurl pkg-config libX11 libpng libjpeg expat libXaw bison libtool fontconfig pango gd libwebp; }; in let inherit (gnome2) libgnomecanvas; in diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix index e3c48c5724f7..05a0abe93c52 100644 --- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix +++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , pkg-config -, xlibsWrapper +, libX11 , libpng , libjpeg , expat @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xlibsWrapper + libX11 libpng libjpeg expat @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "--with-ltdl-include=${libtool}/include" "--with-ltdl-lib=${libtool.lib}/lib" ] - ++ lib.optional (xlibsWrapper == null) "--without-x"; + ++ lib.optional (libX11 == null) "--without-x"; meta = { description = "A program for visualising graphs"; diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 4598c86fb75b..172c262005fb 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -17,6 +17,8 @@ , CoreFoundation , CoreServices , Security + +, enableMinimal ? false }: let @@ -123,6 +125,25 @@ let sed -i "s|https://files.pythonhosted.org/packages/[[:alnum:]]*/[[:alnum:]]*/[[:alnum:]]*/|file://$NIX_BUILD_TOP/$sourceRoot/hack_pydeps/|g" $sourceRoot/setup.py ''; + # Now, copy the "sl web" (aka edenscm-isl) results into the output of this + # package, so that the command can actually work. NOTES: + # + # 1) This applies on all systems (so no conditional a la postFixup) + # 2) This doesn't require any kind of fixup itself, so we leave it out + # of postFixup for that reason, too + # 3) If asked, we optionally patch in a hardcoded path to the 'nodejs' package, + # so that 'sl web' always works + # 4) 'sl web' will still work if 'nodejs' is in $PATH, just not OOTB + preFixup = '' + sitepackages=$out/lib/${python38Packages.python.libPrefix}/site-packages + chmod +w $sitepackages + cp -r ${isl} $sitepackages/edenscm-isl + '' + lib.optionalString (!enableMinimal) '' + chmod +w $sitepackages/edenscm-isl/run-isl + substituteInPlace $sitepackages/edenscm-isl/run-isl \ + --replace 'NODE=node' 'NODE=${nodejs}/bin/node' + ''; + postFixup = lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/sl \ --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" @@ -138,9 +159,9 @@ let ]); buildInputs = [ - curl openssl ] ++ lib.optionals stdenv.isDarwin [ + curl libiconv CoreFoundation CoreServices @@ -165,13 +186,8 @@ stdenv.mkDerivation { runHook preInstall mkdir -p $out - cp -r ${sapling}/* $out - sitepackages=$out/lib/${python38Packages.python.libPrefix}/site-packages - chmod +w $sitepackages - cp -r ${isl} $sitepackages/edenscm-isl - runHook postInstall ''; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 9f2487734f02..6aeab3e6e427 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "5.0.1"; + version = "5.1.2"; format = "pyproject"; src = python3Packages.fetchPypi { inherit pname version; - hash = "sha256-PKRioPBhTV6i3ckQgcKuhQFmpBvUQE4o3FLej8qx4mM="; + hash = "sha256-UB9gTT2/rQXV1Q7UQywEHlGBCJDMDmXupD8nYII4dno="; }; checkInputs = with python3Packages; [ @@ -19,6 +19,7 @@ python3Packages.buildPythonApplication rec { mock requests-mock freezegun + pytest-asyncio ]; nativeBuildInputs = with python3Packages; [ @@ -33,6 +34,7 @@ python3Packages.buildPythonApplication rec { pysocks requests websocket-client + urllib3 ]) ++ [ ffmpeg ]; diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/development/libraries/aws-c-mqtt/default.nix index ffeedd93d3ff..f5fc821e4670 100644 --- a/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "aws-c-mqtt"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-mqtt"; rev = "v${version}"; - sha256 = "sha256-+Ah3D+cgGfunX46Fqv6NSNAOzVwrRdZz6oJKP+tHCmU="; + sha256 = "sha256-nmSNG5o2Ck80OG4ZGYIayVdnw3Z2fn1VkUIuI9RYfL8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/development/libraries/libmodbus/default.nix index 24c00dd891be..72fdbc4c0219 100644 --- a/pkgs/development/libraries/libmodbus/default.nix +++ b/pkgs/development/libraries/libmodbus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmodbus"; - version = "3.1.9"; + version = "3.1.10"; src = fetchFromGitHub { owner = "stephane"; repo = "libmodbus"; rev = "v${version}"; - hash = "sha256-aq8JB7CgzK6idU9AAJWkMXyYDXRynSTlNBMyPrNdpLw="; + hash = "sha256-e2lB5D41a5MOmz9M90ZXfIltSOxNDOrQUpRNU2yYd1k="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix index 2edbc35aa899..0a384b03bb2a 100644 --- a/pkgs/development/libraries/ois/default.nix +++ b/pkgs/development/libraries/ois/default.nix @@ -2,18 +2,23 @@ stdenv.mkDerivation rec { pname = "ois"; - version = "1.5"; + version = "1.5.1"; src = fetchFromGitHub { owner = "wgois"; repo = "OIS"; rev = "v${version}"; - sha256 = "0g8krgq5bdx2rw7ig0xva4kqv4x815672i7z6lljp3n8847wmypa"; + sha256 = "sha256-ir6p+Tzf8L5VOW/rsG4yelsth7INbhABO2T7pfMHcFo="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libX11 ] ++ lib.optionals stdenv.isDarwin [ Cocoa IOKit Kernel ]; + buildInputs = lib.optionals stdenv.isLinux [ libX11 ] + ++ lib.optionals stdenv.isDarwin [ Cocoa IOKit Kernel ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; meta = with lib; { description = "Object-oriented C++ input system"; diff --git a/pkgs/development/libraries/physics/clhep/default.nix b/pkgs/development/libraries/physics/clhep/default.nix index f5327edef6f1..a7c38ce3f0f9 100644 --- a/pkgs/development/libraries/physics/clhep/default.nix +++ b/pkgs/development/libraries/physics/clhep/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "clhep"; - version = "2.4.6.1"; + version = "2.4.6.2"; src = fetchurl { url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz"; - hash = "sha256-FwFhuOSYVV91xt55Nq/elWqT/JqhIaFtd56mAgh6Mjk="; + hash = "sha256-re1z5JushaW06G9koO49bzz+VVGw93MceLbY+drG6Nw="; }; prePatch = '' diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index c8f0b37e0659..b9563346ada4 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -30,7 +30,11 @@ stdenv.mkDerivation rec { "-DCBLAS=ON" "-DBUILD_TESTING=ON" ] ++ lib.optional shared "-DBUILD_SHARED_LIBS=ON" - ++ lib.optional blas64 "-DBUILD_INDEX64=ON"; + ++ lib.optional blas64 "-DBUILD_INDEX64=ON" + # Tries to run host platform binaries during the build + # Will likely be disabled by default in 3.12, see: + # https://github.com/Reference-LAPACK/lapack/issues/757 + ++ lib.optional (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) "-DTEST_FORTRAN_COMPILER=OFF"; passthru = { inherit blas64; }; diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index 60be72379565..dabe3f748a92 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.185"; + version = "0.6.186"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vxU+UDPnW4OfhEs66ynN7tFbi8aIHIgLFx/jx+2Fp2w="; + sha256 = "sha256-h8PUxSjC21BsjqFgOOvDPClFLwOTFTTEB57zxUtbuTw="; }; vendorSha256 = "sha256-uaLoh1VhJAT5liGqL77DLhAWviy5Ci8B16LuzCWuek8="; diff --git a/pkgs/development/ocaml-modules/carton/default.nix b/pkgs/development/ocaml-modules/carton/default.nix index 13c5089d822b..1e81f7dce2a0 100644 --- a/pkgs/development/ocaml-modules/carton/default.nix +++ b/pkgs/development/ocaml-modules/carton/default.nix @@ -7,13 +7,13 @@ buildDunePackage rec { pname = "carton"; - version = "0.4.4"; + version = "0.6.0"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/git-${pname}-v${version}.tbz"; - sha256 = "sha256-7mgCgu87Cn4XhjEhonlz9lhgTw0Cu5hnxNJ1wXr+Qhw="; + sha256 = "sha256-NAm4Xq7L0Dgynr8cKZQ356M4GR6D19LbCRxvnSlIf1U="; }; # remove changelogs for mimic and the git* packages diff --git a/pkgs/development/ocaml-modules/carton/git.nix b/pkgs/development/ocaml-modules/carton/git.nix index 2cc6b1336de2..7e08e69543d7 100644 --- a/pkgs/development/ocaml-modules/carton/git.nix +++ b/pkgs/development/ocaml-modules/carton/git.nix @@ -1,6 +1,6 @@ { buildDunePackage, carton, carton-lwt -, bigarray-compat, bigstringaf, lwt, fpath, result -, mmap, fmt, decompress, astring +, bigstringaf, lwt, fpath, result +, fmt, decompress, astring , alcotest, alcotest-lwt, cstruct, logs , mirage-flow, rresult, ke }: @@ -13,12 +13,10 @@ buildDunePackage { propagatedBuildInputs = [ carton carton-lwt - bigarray-compat bigstringaf lwt fpath result - mmap fmt decompress astring diff --git a/pkgs/development/ocaml-modules/carton/lwt.nix b/pkgs/development/ocaml-modules/carton/lwt.nix index 2aeee63dbf1e..33ee70ef348d 100644 --- a/pkgs/development/ocaml-modules/carton/lwt.nix +++ b/pkgs/development/ocaml-modules/carton/lwt.nix @@ -1,8 +1,8 @@ { buildDunePackage, carton , lwt, decompress, optint, bigstringaf , alcotest, alcotest-lwt, cstruct, fmt, logs -, mirage-flow, result, rresult, bigarray-compat -, ke, base64, bos, checkseum, digestif, fpath, mmap +, mirage-flow, result, rresult +, ke, base64, bos, checkseum, digestif, fpath , stdlib-shims , git-binary # pkgs.git }: @@ -31,14 +31,12 @@ buildDunePackage { mirage-flow result rresult - bigarray-compat ke base64 bos checkseum digestif fpath - mmap stdlib-shims ]; diff --git a/pkgs/development/ocaml-modules/git/paf.nix b/pkgs/development/ocaml-modules/git/paf.nix index 476364a52fb9..4806909962c0 100644 --- a/pkgs/development/ocaml-modules/git/paf.nix +++ b/pkgs/development/ocaml-modules/git/paf.nix @@ -13,7 +13,6 @@ , rresult , tls , uri -, bigarray-compat , bigstringaf , domain-name , httpaf @@ -43,7 +42,6 @@ buildDunePackage { mirage-time tls uri - bigarray-compat bigstringaf domain-name httpaf diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index 96ef1037cf69..c7b9d930bd6f 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -1,26 +1,25 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf, result }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf }: let pname = "otfm"; - version = "0.3.0"; + version = "0.4.0"; webpage = "https://erratique.ch/software/${pname}"; in -assert lib.versionAtLeast ocaml.version "4.01.0"; - stdenv.mkDerivation { - name = "ocaml-${pname}-${version}"; + pname = "ocaml${ocaml.version}-${pname}"; + inherit version; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "054s82539k3kc9na6s47g3scsl04icjahpas7pv5351jmsgqcq3k"; + hash = "sha256-02U23mYTy0ZJgSObDoyygPTGEMC4/Zge5bux4wshaEE="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ topkg ]; - propagatedBuildInputs = [ uutf result ]; + propagatedBuildInputs = [ uutf ]; strictDeps = true; diff --git a/pkgs/development/python-modules/aionanoleaf/default.nix b/pkgs/development/python-modules/aionanoleaf/default.nix index 40686bf7d113..e819431a4220 100644 --- a/pkgs/development/python-modules/aionanoleaf/default.nix +++ b/pkgs/development/python-modules/aionanoleaf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aionanoleaf"; - version = "0.2.0"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "milanmeu"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-bz568DlodWtSu2WTTd/QMhdiX9IkllW7UYVXuNlKFaY="; + rev = "refs/tags/v${version}"; + hash = "sha256-f0TyXhuAzI0s0n6sXH9mKWA4nad2YchZkQ0+jw/Bmv0="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for the Nanoleaf API"; homepage = "https://github.com/milanmeu/aionanoleaf"; + changelog = "https://github.com/milanmeu/aionanoleaf/releases/tag/v${version}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index b3cb92b95fe6..0a779bd7478a 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "5.1.0"; + version = "5.1.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jhoPgwydB/DZx7hC16XgM0UBhmByVZRT5b7BDETA+FY="; + hash = "sha256-6HUykGN0zx97K4372dU1RPncajJt2n20zp2FhrJG1sM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix index 37ca7ebe7bdb..8dd16f32602e 100644 --- a/pkgs/development/python-modules/authlib/default.nix +++ b/pkgs/development/python-modules/authlib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "authlib"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "lepture"; repo = "authlib"; rev = "refs/tags/v${version}"; - hash = "sha256-UTsQRAgmYu4BwT0WWE6XOjTYyGWZIt8bMH9qJ8KLOWA="; + hash = "sha256-OYfvfPnpWE9g7L9cFXUD95B/9+OZy55ZVbmFhFgguUg="; }; propagatedBuildInputs = [ @@ -60,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for building OAuth and OpenID Connect servers"; homepage = "https://github.com/lepture/authlib"; + changelog = "https://github.com/lepture/authlib/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ flokli ]; }; diff --git a/pkgs/development/python-modules/calver/default.nix b/pkgs/development/python-modules/calver/default.nix new file mode 100644 index 000000000000..13377419c174 --- /dev/null +++ b/pkgs/development/python-modules/calver/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: +let + pname = "calver"; + version = "2022.6.26"; + +in +buildPythonPackage { + inherit pname version; + + src = fetchPypi { + inherit pname version; + hash = "sha256-4FSTo7F1F+8XSPvmENoR8QSF+qfEFrnTP9SlLXSJT4s="; + }; + + meta = { + description = "Setuptools extension for CalVer package versions"; + homepage = "https://github.com/di/calver"; + license = lib.licenses.asl20; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index d68ec8f4b75e..013df4dc0fae 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "django-hijack"; - version = "3.2.4"; + version = "3.2.5"; # the wheel comes with pre-built assets, allowing us to avoid fighting # with npm/webpack/gettext to build them ourselves. @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "django_hijack"; dist = "py3"; python = "py3"; - sha256 = "sha256-tSIovIPEszq00Y0PMl/Wlx5YK5MTxLhCpNpHFZDi9rQ="; + sha256 = "sha256-8BHnC3uK6zmSWKfvtDJuTjAKwQlL75G/QwRPgtNJYkE="; }; propagatedBuildInputs = [ django django_compat ]; diff --git a/pkgs/development/python-modules/django_classytags/default.nix b/pkgs/development/python-modules/django_classytags/default.nix index d7d2e8789ae7..06a336be0814 100644 --- a/pkgs/development/python-modules/django_classytags/default.nix +++ b/pkgs/development/python-modules/django_classytags/default.nix @@ -2,27 +2,37 @@ , buildPythonPackage , fetchPypi , django -, six +, pythonOlder }: buildPythonPackage rec { pname = "django-classy-tags"; - version = "3.0.1"; + version = "4.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0iK0VQKsmeVQpWZmeDnvrvlUucc2amST8UOGKqvqyHg="; + hash = "sha256-25/Hxe0I3CYZzEwZsZUUzawT3bYYJ4qwcJTGJtKO7w0="; }; - propagatedBuildInputs = [ django six ]; + propagatedBuildInputs = [ + django + ]; # pypi version doesn't include runtest.py, needed to run tests doCheck = false; + pythonImportsCheck = [ + "classytags" + ]; + meta = with lib; { description = "Class based template tags for Django"; homepage = "https://github.com/divio/django-classy-tags"; + changelog = "https://github.com/django-cms/django-classy-tags/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index 930077939818..ca7fcae7406e 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -2,13 +2,16 @@ , lib , fetchPypi , buildPythonPackage -, isPy3k , python +, pythonOlder }: buildPythonPackage rec { pname = "docutils"; version = "0.19"; + + disabled = pythonOlder "3.7"; + format = "setuptools"; src = fetchPypi { @@ -18,7 +21,7 @@ buildPythonPackage rec { # Only Darwin needs LANG, but we could set it in general. # It's done here conditionally to prevent mass-rebuilds. - checkPhase = lib.optionalString (isPy3k && stdenv.isDarwin) ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + '' + checkPhase = lib.optionalString stdenv.isDarwin ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + '' ${python.interpreter} test/alltests.py ''; diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 1d4326f74ee3..ca4fb75af304 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -5,7 +5,6 @@ , setuptools , six , appdirs -, scandir ? null , backports_os ? null , typing ? null , pytz @@ -36,7 +35,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ six appdirs pytz setuptools ] ++ lib.optionals (!isPy3k) [ backports_os ] ++ lib.optionals (!pythonAtLeast "3.6") [ typing ] - ++ lib.optionals (!pythonAtLeast "3.5") [ scandir ] ++ lib.optionals (!pythonAtLeast "3.5") [ enum34 ]; LC_ALL="en_US.utf-8"; diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index de424d8afdf9..1f23192eaaf1 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -1,10 +1,10 @@ { lib , aiohttp , aioresponses +, aqipy-atmotech , buildPythonPackage , dacite , fetchFromGitHub -, aqipy-atmotech , orjson , pytest-asyncio , pytest-error-for-skips @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to get air quality data from Nettigo Air Monitor devices"; homepage = "https://github.com/bieniu/nettigo-air-monitor"; + changelog = "https://github.com/bieniu/nettigo-air-monitor/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/parameterizedtestcase/default.nix b/pkgs/development/python-modules/parameterizedtestcase/default.nix deleted file mode 100644 index 9d277af8d1a9..000000000000 --- a/pkgs/development/python-modules/parameterizedtestcase/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, python -, isPy27 -}: - -buildPythonPackage rec { - pname = "parameterizedtestcase"; - version = "0.1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "4ccc1d15d7e7ef153619a6a9cd45b170268cf82c67fdd336794c75139aae127e"; - }; - - checkPhase = '' - runHook preCheck - ${python.interpreter} -m parameterizedtestcase.tests - runHook postCheck - ''; - - doCheck = isPy27; - - meta = with lib; { - description = "Parameterized tests for Python's unittest module"; - homepage = "https://github.com/msabramo/python_unittest_parameterized_test_case"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; - broken = python.isPy3k; # uses use_2to3 - }; -} diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index f0f0163652ca..c382f74ae22b 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -3,7 +3,6 @@ , fetchPypi , six , pythonOlder -, scandir ? null , glibcLocales , mock , typing @@ -19,7 +18,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six ] - ++ lib.optionals (pythonOlder "3.5") [ scandir typing ]; + ++ lib.optionals (pythonOlder "3.5") [ typing ]; checkInputs = [ glibcLocales ] ++ lib.optional (pythonOlder "3.3") mock; diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix deleted file mode 100644 index 14acb15e03b5..000000000000 --- a/pkgs/development/python-modules/pygobject/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, python, buildPythonPackage, pkg-config, glib, isPy3k, pythonAtLeast }: - -buildPythonPackage rec { - pname = "pygobject"; - version = "2.28.7"; - format = "other"; - disabled = pythonAtLeast "3.9"; - - src = fetchurl { - url = "mirror://gnome/sources/pygobject/2.28/${pname}-${version}.tar.xz"; - sha256 = "0nkam61rsn7y3wik3vw46wk5q2cjfh2iph57hl9m39rc8jijb7dv"; - }; - - outputs = [ "out" "devdoc" ]; - - patches = lib.optionals stdenv.isDarwin [ - ./pygobject-2.0-fix-darwin.patch - (fetchpatch { - url = "https://github.com/macports/macports-ports/raw/f2975d5bbbc2459c661905c5a850cc661fa32f55/python/py-gobject/files/py-gobject-dynamic_lookup-11.patch"; - sha256 = "sha256-mtlyu+La3+iC5iQAmVJzDA5E35XGaRQy/EKXzvrWRCg="; - extraPrefix = ""; - }) - ]; - - configureFlags = [ "--disable-introspection" ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib ]; - - # in a "normal" setup, pygobject and pygtk are installed into the - # same site-packages: we need a pth file for both. pygtk.py would be - # used to select a specific version, in our setup it should have no - # effect, but we leave it in case somebody expects and calls it. - postInstall = lib.optionalString (!isPy3k) '' - mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${pname}-${version}.pth} - - # Prevent wrapping of codegen files as these are meant to be - # executed by the python program - chmod a-x $out/share/pygobject/*/codegen/*.py - ''; - - meta = with lib; { - homepage = "https://pygobject.readthedocs.io/"; - description = "Python bindings for GLib"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 41f4ea8103af..48bed6efb8b5 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.22.0"; + version = "0.23.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-/FECjJ/iVx4CTtOgxpPBF0lZCctghmD4qUrQQYwmAkQ="; + hash = "sha256-vBXOZ+AhhqWUD6XukmkHF4wjjJxXbK7r0V+qCuZGc6s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix index 92c6c03eb992..1f04a3a14b2d 100644 --- a/pkgs/development/python-modules/python-fsutil/default.nix +++ b/pkgs/development/python-modules/python-fsutil/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-fsutil"; - version = "0.7.0"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2T2C2bIOAdxppZxqI+QGE2R/+46LoqB7eNdlt4sVAd8="; + hash = "sha256-J5B5THfB/yPG1JSCpO2HTHTH0jn0nbKFzXpZMGJ/dKA="; }; propagatedBuildInputs = [ @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module with file-system utilities"; homepage = "https://github.com/fabiocaccamo/python-fsutil"; + changelog = "https://github.com/fabiocaccamo/python-fsutil/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 35df2ced7e89..88946ce878d5 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.4.1"; + version = "3.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RPCzxcuD57ma306GLYsxxvvvZ0e8RTd/KxOeMSaQQQQ="; + hash = "sha256-mjKbCy4WalB3kRk1x6bTBLARCW0vrUbSdcvvDP//TzM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 50fbb2400f93..661d3ce8c7a1 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "65.6.0.0"; + version = "65.6.0.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MnC+rbmbxvpLmlzDUQbnFEpcMwKM5ImSsQ50rcjMXII="; + sha256 = "sha256-rWDM8B1ibel2IiREjzbBPgZg6GOv1twR2Xmzc5psfSQ="; }; # Module doesn't have tests diff --git a/pkgs/development/python2-modules/Pygments/default.nix b/pkgs/development/python2-modules/Pygments/default.nix deleted file mode 100644 index aa59c370d2e7..000000000000 --- a/pkgs/development/python2-modules/Pygments/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, fetchpatch -, docutils -}: - -buildPythonPackage rec { - pname = "Pygments"; - version = "2.5.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe"; - }; - - patches = [ - (fetchpatch { - name = "CVE-2021-27291.patch"; - url = "https://github.com/pygments/pygments/commit/2e7e8c4a7b318f4032493773732754e418279a14.patch"; - sha256 = "0ap7jgkmvkkzijabsgnfrwl376cjsxa4jmzvqysrkwpjq3q4rxpa"; - excludes = ["CHANGES"]; - }) - ]; - - propagatedBuildInputs = [ docutils ]; - - # Circular dependency with sphinx - doCheck = false; - - meta = { - homepage = "https://pygments.org/"; - description = "A generic syntax highlighter"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ ]; - }; -} diff --git a/pkgs/development/python2-modules/boto3/default.nix b/pkgs/development/python2-modules/boto3/default.nix deleted file mode 100644 index c8b8210f6503..000000000000 --- a/pkgs/development/python2-modules/boto3/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, botocore -, jmespath -, s3transfer -, futures ? null -, docutils -, nose -, mock -, isPy3k -}: - -buildPythonPackage rec { - pname = "boto3"; - version = "1.17.97"; # N.B: if you change this, change botocore and awscli to a matching version - - src = fetchPypi { - inherit pname version; - sha256 = "0ab5afc51461c30f27aebef944211d16f47697b98ff8d2e2f6e49e59584853bb"; - }; - - propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; - checkInputs = [ docutils nose mock ]; - - checkPhase = '' - runHook preCheck - # This method is not in mock. It might have appeared in some versions. - sed -i 's/action.assert_called_once()/self.assertEqual(action.call_count, 1)/' \ - tests/unit/resources/test_factory.py - nosetests -d tests/unit --verbose - runHook postCheck - ''; - - # Network access - doCheck = false; - - pythonImportsCheck = [ "boto3" ]; - - meta = { - homepage = "https://github.com/boto/boto3"; - license = lib.licenses.asl20; - description = "AWS SDK for Python"; - longDescription = '' - Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for - Python, which allows Python developers to write software that makes use of - services like Amazon S3 and Amazon EC2. - ''; - }; -} diff --git a/pkgs/development/python2-modules/botocore/default.nix b/pkgs/development/python2-modules/botocore/default.nix deleted file mode 100644 index f23a10579c6e..000000000000 --- a/pkgs/development/python2-modules/botocore/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, python-dateutil -, jmespath -, docutils -, simplejson -, mock -, nose -, urllib3 -}: - -buildPythonPackage rec { - pname = "botocore"; - version = "1.20.97"; # N.B: if you change this, change boto3 and awscli to a matching version - - src = fetchPypi { - inherit pname version; - sha256 = "f7e119cf3e0f4a36100f0e983583afa91a84fb27c479a1716820aee4f2e190ab"; - }; - - propagatedBuildInputs = [ - python-dateutil - jmespath - docutils - simplejson - urllib3 - ]; - - checkInputs = [ mock nose ]; - - checkPhase = '' - nosetests -v - ''; - - # Network access - doCheck = false; - - pythonImportsCheck = [ "botocore" ]; - - meta = with lib; { - homepage = "https://github.com/boto/botocore"; - license = licenses.asl20; - description = "A low-level interface to a growing number of Amazon Web Services"; - }; -} diff --git a/pkgs/development/python2-modules/certifi/default.nix b/pkgs/development/python2-modules/certifi/default.nix deleted file mode 100644 index 529d5b1fb996..000000000000 --- a/pkgs/development/python2-modules/certifi/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, fetchPypi -, buildPythonPackage -, python3 -}: - -let - inherit (python3.pkgs) certifi; - -in buildPythonPackage rec { - pname = "certifi"; - version = "2019.11.28"; - - src = fetchPypi { - inherit pname version; - sha256 = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f"; - }; - - postPatch = '' - cp ${certifi.src}/certifi/cacert.pem certifi/cacert.pem - ''; - - pythonImportsCheck = [ "certifi" ]; - - # no tests implemented - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/certifi/python-certifi"; - description = "Python package for providing Mozilla's CA Bundle"; - license = licenses.isc; - maintainers = with maintainers; [ ]; # NixOps team - }; -} diff --git a/pkgs/development/python2-modules/chardet/default.nix b/pkgs/development/python2-modules/chardet/default.nix deleted file mode 100644 index 5f6fe0a672a7..000000000000 --- a/pkgs/development/python2-modules/chardet/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch -, pytest, pytest-runner, hypothesis }: - -buildPythonPackage rec { - pname = "chardet"; - version = "3.0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4"; - }; - - patches = [ - # Add pytest 4 support. See: https://github.com/chardet/chardet/pull/174 - (fetchpatch { - url = "https://github.com/chardet/chardet/commit/0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4.patch"; - sha256 = "1y1xhjf32rdhq9sfz58pghwv794f3w2f2qcn8p6hp4pc8jsdrn2q"; - }) - ]; - - checkInputs = [ pytest pytest-runner hypothesis ]; - - meta = with lib; { - homepage = "https://github.com/chardet/chardet"; - description = "Universal encoding detector"; - license = licenses.lgpl2; - maintainers = with maintainers; [ domenkozar ]; - }; -} diff --git a/pkgs/development/python2-modules/google-apputils/default.nix b/pkgs/development/python2-modules/google-apputils/default.nix deleted file mode 100644 index 225adf348d1a..000000000000 --- a/pkgs/development/python2-modules/google-apputils/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, isPy3k -, pytz -, gflags -, python-dateutil -, mox -, python -}: - -buildPythonPackage rec { - pname = "google-apputils"; - version = "0.4.2"; - disabled = isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "0afw0gxmh0yw5g7xsmw49gs8bbp0zyhbh6fr1b0h48f3a439v5a7"; - }; - - preConfigure = '' - sed -i '/ez_setup/d' setup.py - ''; - - propagatedBuildInputs = [ pytz gflags python-dateutil mox ]; - - checkPhase = '' - ${python.executable} setup.py google_test - ''; - - # ERROR:root:Trying to access flag test_tmpdir before flags were parsed. - doCheck = false; - - meta = with lib; { - description = "Google Application Utilities for Python"; - homepage = "https://github.com/google/google-apputils"; - license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/python2-modules/gtkme/default.nix b/pkgs/development/python2-modules/gtkme/default.nix deleted file mode 100644 index bc23854d95c8..000000000000 --- a/pkgs/development/python2-modules/gtkme/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pkg-config -, gobject-introspection -, pygobject3 -, gtk3 -, glib -}: - -buildPythonPackage rec { - pname = "gtkme"; - version = "1.5.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-NIUgnbfcHjbPfsH3CF2Bywo8owrdsi1wqDoMxOa+2U4="; - }; - - nativeBuildInputs = [ pkg-config gobject-introspection gtk3 ]; - buildInputs = [ pygobject3 glib ]; - propagatedBuildInputs = [ gtk3 ]; - - pythonImportsCheck = [ - "gtkme" - ]; - - meta = with lib; { - description = "Manages an Application with Gtk windows, forms, lists and other complex items easily"; - homepage = "https://gitlab.com/doctormo/gtkme"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ - revol-xut - ]; - }; -} diff --git a/pkgs/development/python2-modules/idna/default.nix b/pkgs/development/python2-modules/idna/default.nix deleted file mode 100644 index 9a1c1dc271f1..000000000000 --- a/pkgs/development/python2-modules/idna/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "idna"; - version = "2.10"; - - src = fetchPypi { - inherit pname version; - sha256 = "b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"; - }; - - checkInputs = [ pytestCheckHook ]; - - meta = { - homepage = "https://github.com/kjd/idna/"; - description = "Internationalized Domain Names in Applications (IDNA)"; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/development/python2-modules/marisa/default.nix b/pkgs/development/python2-modules/marisa/default.nix deleted file mode 100644 index 93a4ccb959f7..000000000000 --- a/pkgs/development/python2-modules/marisa/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, marisa, swig -, isPy3k -}: - -buildPythonPackage rec { - pname = "marisa"; - version = "1.3.40"; - - disabled = isPy3k; - - src = fetchFromGitHub { - owner = "s-yata"; - repo = "marisa-trie"; - rev = "8dba9850b89d7828ebf33b8ab84df2b54d31260b"; - sha256 = "0pkp9fggk53lxlicfwrskgx33qplc4v6njbavlnz4x4z63zd4933"; - }; - - nativeBuildInputs = [ swig marisa ]; - buildInputs = [ marisa ]; - - sourceRoot = "${src.name}/bindings/python"; - - meta = with lib; { - description = "Python binding for marisa package (do not confuse with marisa-trie python bindings)"; - homepage = "https://github.com/s-yata/marisa-trie"; - license = with licenses; [ bsd2 lgpl2 ]; - maintainers = with maintainers; [ vanzef ]; - }; -} diff --git a/pkgs/development/python2-modules/protobuf/default.nix b/pkgs/development/python2-modules/protobuf/default.nix deleted file mode 100644 index 30e9fbf9ea75..000000000000 --- a/pkgs/development/python2-modules/protobuf/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ buildPackages -, lib -, fetchpatch -, python -, buildPythonPackage -, isPy37 -, protobuf -, google-apputils ? null -, six -, pyext -, isPy27 -, disabled -, doCheck ? true -}: - -buildPythonPackage { - inherit (protobuf) pname src version; - inherit disabled; - doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2 - - propagatedBuildInputs = [ six ] ++ lib.optionals isPy27 [ google-apputils ]; - propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc. - nativeBuildInputs = [ pyext ] ++ lib.optionals isPy27 [ google-apputils ]; - buildInputs = [ protobuf ]; - - patches = lib.optional (isPy37 && (lib.versionOlder protobuf.version "3.6.1.2")) - # Python 3.7 compatibility (not needed for protobuf >= 3.6.1.2) - (fetchpatch { - url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch"; - sha256 = "09hw22y3423v8bbmc9xm07znwdxfbya6rp78d4zqw6fisdvjkqf1"; - stripLen = 1; - }) - ; - - prePatch = '' - while [ ! -d python ]; do - cd * - done - cd python - ''; - - setupPyGlobalFlags = lib.optional (lib.versionAtLeast protobuf.version "2.6.0") - "--cpp_implementation"; - - pythonImportsCheck = [ - "google.protobuf" - ] ++ lib.optionals (lib.versionAtLeast protobuf.version "2.6.0") [ - "google.protobuf.internal._api_implementation" # Verify that --cpp_implementation worked - ]; - - meta = with lib; { - description = "Protocol Buffers are Google's data interchange format"; - homepage = "https://developers.google.com/protocol-buffers/"; - license = licenses.bsd3; - maintainers = with maintainers; [ knedlsepp ]; - }; - - passthru.protobuf = protobuf; -} diff --git a/pkgs/development/python2-modules/pygobject/default.nix b/pkgs/development/python2-modules/pygobject/default.nix index ce9410eaf8b5..2a09002976b2 100644 --- a/pkgs/development/python2-modules/pygobject/default.nix +++ b/pkgs/development/python2-modules/pygobject/default.nix @@ -1,33 +1,48 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection, -pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome }: +{ lib, stdenv, fetchurl, fetchpatch, python, buildPythonPackage, pkg-config, glib, isPy3k, pythonAtLeast }: buildPythonPackage rec { pname = "pygobject"; - version = "3.36.1"; - + version = "2.28.7"; format = "other"; + disabled = pythonAtLeast "3.9"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0b9CgC0c7BE7Wtqg579/N0W0RSHcIWNYjSdtXNYdcY8="; + url = "mirror://gnome/sources/pygobject/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0nkam61rsn7y3wik3vw46wk5q2cjfh2iph57hl9m39rc8jijb7dv"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "devdoc" ]; - mesonFlags = [ - "-Dpython=python${if isPy3k then "3" else "2" }" + patches = lib.optionals stdenv.isDarwin [ + ./pygobject-2.0-fix-darwin.patch + (fetchpatch { + url = "https://github.com/macports/macports-ports/raw/f2975d5bbbc2459c661905c5a850cc661fa32f55/python/py-gobject/files/py-gobject-dynamic_lookup-11.patch"; + sha256 = "sha256-mtlyu+La3+iC5iQAmVJzDA5E35XGaRQy/EKXzvrWRCg="; + extraPrefix = ""; + }) ]; - nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ]; - buildInputs = [ glib gobject-introspection ] - ++ lib.optionals stdenv.isDarwin [ which ncurses ]; - propagatedBuildInputs = [ pycairo cairo ]; + configureFlags = [ "--disable-introspection" ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ glib ]; + + # in a "normal" setup, pygobject and pygtk are installed into the + # same site-packages: we need a pth file for both. pygtk.py would be + # used to select a specific version, in our setup it should have no + # effect, but we leave it in case somebody expects and calls it. + postInstall = lib.optionalString (!isPy3k) '' + mv $out/${python.sitePackages}/{pygtk.pth,${pname}-${version}.pth} + + # Prevent wrapping of codegen files as these are meant to be + # executed by the python program + chmod a-x $out/share/pygobject/*/codegen/*.py + ''; meta = with lib; { homepage = "https://pygobject.readthedocs.io/"; - description = "Python bindings for Glib"; + description = "Python bindings for GLib"; license = licenses.gpl2; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.unix; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pygobject/pygobject-2.0-fix-darwin.patch b/pkgs/development/python2-modules/pygobject/pygobject-2.0-fix-darwin.patch index 7fef05262f4d..7fef05262f4d 100644 --- a/pkgs/development/python-modules/pygobject/pygobject-2.0-fix-darwin.patch +++ b/pkgs/development/python2-modules/pygobject/pygobject-2.0-fix-darwin.patch diff --git a/pkgs/development/python2-modules/pyroma/default.nix b/pkgs/development/python2-modules/pyroma/default.nix deleted file mode 100644 index 9fee5ec56c0e..000000000000 --- a/pkgs/development/python2-modules/pyroma/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi -, docutils, pygments, setuptools -}: - -buildPythonPackage rec { - pname = "pyroma"; - version = "2.6.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "2527423e3a24ccd56951f3ce1b0ebbcc4fa0518c82fca882e696c78726ab9c2f"; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace "pygments < 2.6" "pygments" - ''; - - propagatedBuildInputs = [ docutils pygments setuptools ]; - - meta = with lib; { - description = "Test your project's packaging friendliness"; - homepage = "https://github.com/regebro/pyroma"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python2-modules/pysqlite/default.nix b/pkgs/development/python2-modules/pysqlite/default.nix deleted file mode 100644 index 09cc312223ad..000000000000 --- a/pkgs/development/python2-modules/pysqlite/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, stdenv -, buildPythonPackage -, fetchPypi -, isPy3k -, pkgs -}: - -buildPythonPackage rec { - pname = "pysqlite"; - version = "2.8.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "17d3335863e8cf8392eea71add33dab3f96d060666fe68ab7382469d307f4490"; - }; - - # Need to use the builtin sqlite3 on Python 3 - disabled = isPy3k; - - # Since the `.egg' file is zipped, the `NEEDED' of the `.so' files - # it contains is not taken into account. Thus, we must explicitly make - # it a propagated input. - propagatedBuildInputs = [ pkgs.sqlite ]; - - patchPhase = '' - substituteInPlace "setup.cfg" \ - --replace "/usr/local/include" "${pkgs.sqlite.dev}/include" \ - --replace "/usr/local/lib" "${pkgs.sqlite.out}/lib" - ${lib.optionalString (!stdenv.isDarwin) ''export LDSHARED="$CC -pthread -shared"''} - ''; - - meta = with lib; { - homepage = "https://pysqlite.org/"; - description = "Python bindings for the SQLite embedded relational database engine"; - longDescription = '' - pysqlite is a DB-API 2.0-compliant database interface for SQLite. - - SQLite is a relational database management system contained in - a relatively small C library. It is a public domain project - created by D. Richard Hipp. Unlike the usual client-server - paradigm, the SQLite engine is not a standalone process with - which the program communicates, but is linked in and thus - becomes an integral part of the program. The library - implements most of SQL-92 standard, including transactions, - triggers and most of complex queries. - - pysqlite makes this powerful embedded SQL engine available to - Python programmers. It stays compatible with the Python - database API specification 2.0 as much as possible, but also - exposes most of SQLite's native API, so that it is for example - possible to create user-defined SQL functions and aggregates - in Python. - ''; - license = licenses.bsd3; - }; - -} diff --git a/pkgs/development/python2-modules/pytest-runner/default.nix b/pkgs/development/python2-modules/pytest-runner/default.nix deleted file mode 100644 index bea83146c37d..000000000000 --- a/pkgs/development/python2-modules/pytest-runner/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }: - -buildPythonPackage rec { - pname = "pytest-runner"; - version = "5.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "96c7e73ead7b93e388c5d614770d2bae6526efd997757d3543fe17b557a0942b"; - }; - - nativeBuildInputs = [ setuptools-scm pytest ]; - - postPatch = '' - rm pytest.ini - ''; - - checkPhase = '' - py.test tests - ''; - - # Fixture not found - doCheck = false; - - meta = with lib; { - description = "Invoke py.test as distutils command with dependency resolution"; - homepage = "https://github.com/pytest-dev/pytest-runner"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python2-modules/s3transfer/default.nix b/pkgs/development/python2-modules/s3transfer/default.nix deleted file mode 100644 index 4fd0fe346add..000000000000 --- a/pkgs/development/python2-modules/s3transfer/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, fetchPypi -, pythonOlder -, buildPythonPackage -, docutils -, mock -, nose -, coverage -, wheel -, botocore -, futures ? null -}: - -buildPythonPackage rec { - pname = "s3transfer"; - version = "0.4.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI="; - }; - - propagatedBuildInputs = - [ - botocore - ] ++ lib.optional (pythonOlder "3") futures; - - buildInputs = [ - docutils - mock - nose - coverage - wheel - ]; - - checkPhase = '' - pushd s3transfer/tests - nosetests -v unit/ functional/ - popd - ''; - - # version on pypi has no tests/ dir - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/boto/s3transfer"; - license = licenses.asl20; - description = "A library for managing Amazon S3 transfers"; - }; -} diff --git a/pkgs/development/python2-modules/scandir/add-aarch64-darwin-dirent.patch b/pkgs/development/python2-modules/scandir/add-aarch64-darwin-dirent.patch deleted file mode 100644 index 1b35a0b950ce..000000000000 --- a/pkgs/development/python2-modules/scandir/add-aarch64-darwin-dirent.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/scandir.py b/scandir.py -index 3f602fb..40af3e5 100644 ---- a/scandir.py -+++ b/scandir.py -@@ -23,6 +23,7 @@ from os import listdir, lstat, stat, strerror - from os.path import join, islink - from stat import S_IFDIR, S_IFLNK, S_IFREG - import collections -+import platform - import sys - - try: -@@ -432,6 +433,15 @@ elif sys.platform.startswith(('linux', 'darwin', 'sunos5')) or 'bsd' in sys.plat - ('__d_padding', ctypes.c_uint8 * 4), - ('d_name', ctypes.c_char * 256), - ) -+ elif 'darwin' in sys.platform and 'arm64' in platform.machine(): -+ _fields_ = ( -+ ('d_ino', ctypes.c_uint64), -+ ('d_off', ctypes.c_uint64), -+ ('d_reclen', ctypes.c_uint16), -+ ('d_namlen', ctypes.c_uint16), -+ ('d_type', ctypes.c_uint8), -+ ('d_name', ctypes.c_char * 1024), -+ ) - else: - _fields_ = ( - ('d_ino', ctypes.c_uint32), # must be uint32, not ulong diff --git a/pkgs/development/python2-modules/scandir/default.nix b/pkgs/development/python2-modules/scandir/default.nix deleted file mode 100644 index e712cca8348d..000000000000 --- a/pkgs/development/python2-modules/scandir/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, python, buildPythonPackage, fetchPypi }: - -buildPythonPackage rec { - pname = "scandir"; - version = "1.10.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1bkqwmf056pkchf05ywbnf659wqlp6lljcdb0y88wr9f0vv32ijd"; - }; - - patches = [ - ./add-aarch64-darwin-dirent.patch - ]; - - checkPhase = "${python.interpreter} test/run_tests.py"; - - meta = with lib; { - description = "A better directory iterator and faster os.walk()"; - homepage = "https://github.com/benhoyt/scandir"; - license = licenses.gpl3; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/development/python2-modules/sphinx/default.nix b/pkgs/development/python2-modules/sphinx/default.nix deleted file mode 100644 index 80dec0531085..000000000000 --- a/pkgs/development/python2-modules/sphinx/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytest -, simplejson -, mock -, glibcLocales -, html5lib -, pythonOlder -, enum34 -, python -, docutils -, jinja2 -, pygments -, alabaster -, babel -, snowballstemmer -, six -, sqlalchemy -, whoosh -, imagesize -, requests -, typing -, sphinxcontrib-websupport -, setuptools -}: - -buildPythonPackage rec { - pname = "sphinx"; - version = "1.8.5"; - src = fetchPypi { - pname = "Sphinx"; - inherit version; - sha256 = "c7658aab75c920288a8cf6f09f244c6cfdae30d82d803ac1634d9f223a80ca08"; - }; - LC_ALL = "en_US.UTF-8"; - - checkInputs = [ pytest ]; - buildInputs = [ simplejson mock glibcLocales html5lib ] ++ lib.optional (pythonOlder "3.4") enum34; - # Disable two tests that require network access. - checkPhase = '' - cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored' - ''; - propagatedBuildInputs = [ - docutils - jinja2 - pygments - alabaster - babel - setuptools - snowballstemmer - six - sphinxcontrib-websupport - sqlalchemy - whoosh - imagesize - requests - ] ++ lib.optional (pythonOlder "3.5") typing; - - # Lots of tests. Needs network as well at some point. - doCheck = false; - - patches = [ - # Since pygments 2.5, PythonLexer refers to python3. If we want to use - # python2, we need to explicitly specify Python2Lexer. - # Not upstreamed since there doesn't seem to be any upstream maintenance - # branch for 1.8 (and this patch doesn't make any sense for 2.x). - ./python2-lexer.patch - ]; - # https://github.com/NixOS/nixpkgs/issues/22501 - # Do not run `python sphinx-build arguments` but `sphinx-build arguments`. - postPatch = '' - substituteInPlace sphinx/make_mode.py --replace "sys.executable, " "" - ''; - - meta = { - description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; - homepage = "http://sphinx.pocoo.org/"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ ]; - }; -} diff --git a/pkgs/development/python2-modules/sphinx/python2-lexer.patch b/pkgs/development/python2-modules/sphinx/python2-lexer.patch deleted file mode 100644 index cf4a243315a2..000000000000 --- a/pkgs/development/python2-modules/sphinx/python2-lexer.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py -index ac2bd1b06..63ca52de2 100644 ---- a/sphinx/highlighting.py -+++ b/sphinx/highlighting.py -@@ -16,7 +16,7 @@ from pygments.filters import ErrorToken - from pygments.formatters import HtmlFormatter, LatexFormatter - from pygments.lexer import Lexer # NOQA - from pygments.lexers import get_lexer_by_name, guess_lexer --from pygments.lexers import PythonLexer, Python3Lexer, PythonConsoleLexer, \ -+from pygments.lexers import Python2Lexer, Python3Lexer, PythonConsoleLexer, \ - CLexer, TextLexer, RstLexer - from pygments.styles import get_style_by_name - from pygments.util import ClassNotFound -@@ -40,7 +40,7 @@ logger = logging.getLogger(__name__) - - lexers = dict( - none = TextLexer(stripnl=False), -- python = PythonLexer(stripnl=False), -+ python = Python2Lexer(stripnl=False), - python3 = Python3Lexer(stripnl=False), - pycon = PythonConsoleLexer(stripnl=False), - pycon3 = PythonConsoleLexer(python3=True, stripnl=False), diff --git a/pkgs/development/python2-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python2-modules/sphinxcontrib-websupport/default.nix deleted file mode 100644 index b1bdf6a0dff6..000000000000 --- a/pkgs/development/python2-modules/sphinxcontrib-websupport/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, six -}: - -buildPythonPackage rec { - pname = "sphinxcontrib-websupport"; - version = "1.1.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "1501befb0fdf1d1c29a800fdbf4ef5dc5369377300ddbdd16d2cd40e54c6eefc"; - }; - - propagatedBuildInputs = [ six ]; - - doCheck = false; - - meta = { - description = "Sphinx API for Web Apps"; - homepage = "http://sphinx-doc.org/"; - license = lib.licenses.bsd2; - }; -} diff --git a/pkgs/development/python2-modules/typing/default.nix b/pkgs/development/python2-modules/typing/default.nix deleted file mode 100644 index a835be985ff4..000000000000 --- a/pkgs/development/python2-modules/typing/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy3k, isPyPy, unittestCheckHook -, pythonAtLeast }: - -let - testDir = if isPy3k then "src" else "python2"; - -in buildPythonPackage rec { - pname = "typing"; - version = "3.10.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130"; - }; - - disabled = pythonAtLeast "3.5"; - - # Error for Python3.6: ImportError: cannot import name 'ann_module' - # See https://github.com/python/typing/pull/280 - # Also, don't bother on PyPy: AssertionError: TypeError not raised - doCheck = pythonOlder "3.6" && !isPyPy; - - checkInputs = [ unittestCheckHook ]; - - unittestFlagsArray = [ "-s" testDir ]; - - meta = with lib; { - description = "Backport of typing module to Python versions older than 3.5"; - homepage = "https://docs.python.org/3/library/typing.html"; - license = licenses.psfl; - }; -} diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index e7c38c1b0234..0c2b2005ba84 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -3,18 +3,18 @@ , fetchurl , fetchpatch , getopt -, tzdata , ksh +, tzdata , pkgsMusl # for passthru.tests }: stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20220726"; + version = "20220928"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - hash = "sha256-G/N3B4lyJyHcp7C/+K/EqVINog8CGbt7xSNQrwEz8KA="; + hash = "sha256-yAS3feP+uOMd7ipMn7Hp7CTFo0dk56KBXIi07QFlDpA="; }; # Make tests work with musl @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { (fetchpatch { name = "separate-tests.patch"; url = "https://raw.githubusercontent.com/alpinelinux/aports/2a36f7b79df44136c4d2b8e9512f908af65adfee/community/bmake/separate-tests.patch"; - sha256 = "00s76jwyr83c6rkvq67b1lxs8jhm0gj2rjgy77xazqr5400slj9a"; + hash = "sha256-KkmqASAl46/6Of7JLOQDFUqkOw3rGLxnNmyg7Lk0RwM="; }) # add a shebang to bmake's install(1) replacement (fetchpatch { name = "install-sh.patch"; url = "https://raw.githubusercontent.com/alpinelinux/aports/34cd8c45397c63c041cf3cbe1ba5232fd9331196/community/bmake/install-sh.patch"; - sha256 = "0z8icd6akb96r4cksqnhynkn591vbxlmrrs4w6wil3r6ggk6mwa6"; + hash = "sha256-RvFq5nsmDxq54UTnXGlfO6Rip/XQYj0ZySatqUxjEX0="; }) ]; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix index d175bfe01f30..da0e6e1683f3 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix @@ -52,5 +52,8 @@ poetry2nix.mkPoetryApplication { meta = with lib; { inherit (python.meta) platforms; maintainers = with maintainers; [ adisbladis jakewaksbaum ]; + knownVulnerabilities = [ + "CVE-2022-42966" # cleo version in poetry.lock is vulnerable + ]; }; } diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index 8c5a00f9ca61..4129b30035bd 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -1,21 +1,21 @@ -{ lib, rustPlatform, fetchCrate, stdenv, DiskArbitration, Foundation, IOKit }: +{ lib, rustPlatform, fetchCrate, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.17"; + version = "1.0.18"; src = fetchCrate { inherit pname version; - sha256 = "sha256-vtVE7BITzYP9vhSj7HfDm0Mar2bRPmeW1/mE977vvrA="; + sha256 = "sha256-BlWPdZb85XaTGV6ZE3XRVKHJyXimfrezhRyqJVmCFMY="; }; - cargoSha256 = "sha256-VHlnRk5EXZjf+EW/clDOFA+ohh9SqJiRvq1xQcP0Wrk="; + cargoSha256 = "sha256-1qtlsItLP8MdxebgktzTr3R4Kq+PBIAiHGaikbQ796E="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration Foundation IOKit - ]; + ]); meta = with lib; { description = "Graph the number of crates that depend on your crate over time"; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 55b5f0dda210..815351d48220 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "0.2.2"; + version = "0.3.0"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - sha256 = "IIy5ZEx/+StAhtRcGqM3uvvEqu4wGzGUls0K/ot4jRI="; + sha256 = "CPoSo8Kqu87c0bF4J2KSoamz6bsfS/DnkYqRi+XL8Qw="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - sha256 = "5cScLXujNm14+SCr8OcO93RDL3EfAjsuAzfcwj+EMKs="; + sha256 = "0ymZ4cYJn3Qth4jiTeXuAAsY0wFrYO2OHumY5WLamME="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - sha256 = "3PdLVz4qTJQHmM9laL413xnZaSuD6xlaSy8cuJ9M8us="; + sha256 = "8f5w+wu1vId0R7UQsdbi/yopw1R00lR9ibEAOYwUglI="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - sha256 = "eVEopSvyjzY8J3q52wowTlSVHZ4s1lIc8/yU6Ya+0QU="; + sha256 = "bnuz+n8pAhBUgQKImCUKRZCwIqGHHaB3KtZOVfqy4Zw="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/os-specific/darwin/pam-reattach/default.nix b/pkgs/os-specific/darwin/pam-reattach/default.nix new file mode 100644 index 000000000000..03d0547fc167 --- /dev/null +++ b/pkgs/os-specific/darwin/pam-reattach/default.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchFromGitHub, cmake, openpam, darwin }: + +let + sdk = + if stdenv.isAarch64 + then null + else darwin.apple_sdk.sdk; +in + +stdenv.mkDerivation rec { + pname = "pam_reattach"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "fabianishere"; + repo = pname; + rev = "v${version}"; + sha256 = "1k77kxqszdwgrb50w7algj22pb4fy5b9649cjb08zq9fqrzxcbz7"; + }; + + cmakeFlags = [ + "-DCMAKE_OSX_ARCHITECTURES=${ + if stdenv.hostPlatform.system == "x86_64-darwin" then + "x86_64" + else + "arm64" + }" + "-DENABLE_CLI=ON" + ] + ++ lib.optional (sdk != null) + "-DCMAKE_LIBRARY_PATH=${sdk}/usr/lib"; + + buildInputs = [ openpam ] + ++ lib.optional (sdk != null) sdk; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://github.com/fabianishere/pam_reattach"; + description = "Reattach to the user's GUI session on macOS during authentication (for Touch ID support in tmux)"; + license = licenses.mit; + maintainers = with maintainers; [ lockejan ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 34d2910f8f09..8293c9589abc 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.2325"; + version = "0.20.2352"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "LFdgvLFdVSkSaJKonbFz+Wi6+BWkIcybNLvW0C21FOU="; + sha256 = "vxe5B+R5zxKlvnxnXXw9tfgtXGNlEZF3z14NZ7pA3zE="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/jackett/deps.nix b/pkgs/servers/jackett/deps.nix index d6cb03297049..7462dcbad94c 100644 --- a/pkgs/servers/jackett/deps.nix +++ b/pkgs/servers/jackett/deps.nix @@ -181,6 +181,7 @@ (fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.1"; sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json index 1c440ad9279e..e52f1221327c 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json @@ -1,6 +1,6 @@ { "name": "matrix-appservice-slack", - "version": "2.0.1", + "version": "2.0.2", "description": "A Matrix <--> Slack bridge", "engines": { "node": ">=16 <=18" @@ -38,7 +38,7 @@ "Slackdown": "git+https://Half-Shot@github.com/half-shot/slackdown.git", "axios": "^0.27.2", "escape-string-regexp": "^4.0.0", - "matrix-appservice-bridge": "^5.1.0", + "matrix-appservice-bridge": "^6.0.0", "minimist": "^1.2.6", "nedb": "^1.8.0", "node-emoji": "^1.10.0", diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json b/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json index 306f097c97a2..f842fda7ba5f 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json @@ -1,5 +1,5 @@ { - "version": "2.0.1", - "srcHash": "N7EzhqKL3GiuoU2d/Y33eZhKJSCvtLDRVO40mpIBEkw=", - "yarnHash": "1d9kyrzcs1c54xk0yl8n3jp61l3n8dzph1d5a4daifa7ad635hv7" + "version": "2.0.2", + "srcHash": "Z8PQuAOQbQMxmso/KV9n8fu2FqzqLsADqLczmm584QQ=", + "yarnHash": "1ngmgr9li7jagvzfl0jq4bxqw0q1sdqh8k9wlar6q292263g287z" } diff --git a/pkgs/servers/search/manticoresearch/default.nix b/pkgs/servers/search/manticoresearch/default.nix index a2d77d03cc5c..2611798248a6 100644 --- a/pkgs/servers/search/manticoresearch/default.nix +++ b/pkgs/servers/search/manticoresearch/default.nix @@ -58,12 +58,16 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_GALERA=0" + "-DWITH_MYSQL=1" + "-DMYSQL_INCLUDE_DIR=${mariadb-connector-c.dev}/include/mariadb" + "-DMYSQL_LIB=${mariadb-connector-c.out}/lib/mariadb/libmysqlclient.a" ]; meta = with lib; { description = "Easy to use open source fast database for search"; homepage = "https://manticoresearch.com"; license = licenses.gpl2; + mainProgram = "searchd"; maintainers = with maintainers; [ jdelStrother ]; platforms = platforms.all; }; diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index 1440c0cf2a2a..ea413c996fb5 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "FreshRSS"; - version = "1.20.1"; + version = "1.20.2"; src = fetchFromGitHub { owner = "FreshRSS"; repo = "FreshRSS"; rev = version; - hash = "sha256-hpxBPYNFw5Wz07SdYT9GLX8XicAtKi82HjlLCccQMtk="; + hash = "sha256-l1SOaQA4C8yXbrfi7pEE1PpUO4DVmLTTDUSACCSQ5LE="; }; passthru.tests = nixosTests.freshrss; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 03a51b4d08cd..cd4b7f8fd89c 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2022.09.01"; + version = "2022.12.05"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-to9hbhW7t5On4PrQEm2CDrpexaMB4frbVQOdS4DGseg="; + hash = "sha256-DLPew6pz+ABgdxSdHSX62VieRnTvbaj2sY3ujti1aj0="; }; meta = with lib; { diff --git a/pkgs/tools/graphics/adriconf/default.nix b/pkgs/tools/graphics/adriconf/default.nix index a76eebf4938a..e7ae7c28194f 100644 --- a/pkgs/tools/graphics/adriconf/default.nix +++ b/pkgs/tools/graphics/adriconf/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "adriconf"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nxqrs8c1sRruZLwFwK/JfXQPfpEq08Pe2n7ojQkH3SM="; + sha256 = "sha256-RhHmrjb5TvJnZ6R0aefqdmwMBpu4iTrxSHru7JAwrgs="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 2795210101c3..c15ccc03d258 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,19 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fd"; - version = "8.5.3"; + version = "8.6.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; - # On the next release, go back to `rev = "v${version}";` - # The 8.5.3 release appears to have been mysteriously re-tagged: - # https://github.com/sharkdp/fd/issues/1184 - rev = "f6e74407e80a5563a9e4d0530371aed281e05838"; - sha256 = "sha256-7QQHLw+isXtr1FDQr4aiUhvOjJUPbaxFGDwukiWBG9g="; + rev = "v${version}"; + sha256 = "sha256-RVGCSUYyWo2wKRIrnci+aWEAPW9jHhMfYkYJkCgd7f8="; }; - cargoSha256 = "sha256-QFh47Pr+7lIdT++huziKgMJxvsZElTTwu11c7/wjyHE="; + cargoSha256 = "sha256-PT95U1l+BVX7sby3GKktZMmbNNQoPYR8nL+H90EnqZY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/procyon/default.nix b/pkgs/tools/misc/procyon/default.nix index 4d5fb120943f..0a31bc9dca20 100644 --- a/pkgs/tools/misc/procyon/default.nix +++ b/pkgs/tools/misc/procyon/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "procyon"; - version = "0.6-prerelease"; + version = "0.6.0"; src = fetchurl { - url = "https://github.com/mstrobel/procyon/releases/download/${version}/procyon-decompiler-${version}.jar"; - sha256 = "sha256-eBVWKCo8ccAT/T9HgjxUCNFzGyzofc9Mbyp0ldUmrdk="; + url = "https://github.com/mstrobel/procyon/releases/download/v${version}/procyon-decompiler-${version}.jar"; + sha256 = "sha256-gh2pYBL8aSRPoeopjJBFXuTgIUNLx5bTuVRqskYBt3k="; }; dontUnpack = true; diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index ee333d33130e..6c2e6acafe33 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -1,22 +1,25 @@ -{ buildGoModule +{ lib +, buildGoModule , fetchFromGitHub -, lib }: buildGoModule rec { pname = "amass"; - version = "3.20.0"; + version = "3.21.1"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "sha256-c6PAmCIxQEkLJi0PNS+8oO/q3lWS0ZSXMiOiExWRpgY="; + hash = "sha256-QHFMHAKAwPdVhCTLUFtRcX252kyHfLQNPOTJ1WwSLgU="; }; - vendorSha256 = "sha256-hoX/i3RIMhs2ssm1qELHKceS3Vzo6cj/eMuAROyz/mQ="; + vendorHash = "sha256-ytTHJoWjCiIoUJtUYUguphWVXr6gp43pY/L2ik2Bb+A="; - outputs = [ "out" "wordlists" ]; + outputs = [ + "out" + "wordlists" + ]; postInstall = '' mkdir -p $wordlists @@ -41,6 +44,7 @@ buildGoModule rec { that are found under the wordlists output. ''; homepage = "https://owasp.org/www-project-amass/"; + changelog = "https://github.com/OWASP/Amass/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ kalbasit fab ]; }; diff --git a/pkgs/tools/networking/pritunl-client/default.nix b/pkgs/tools/networking/pritunl-client/default.nix index 9e183814572b..1461a8d17e37 100644 --- a/pkgs/tools/networking/pritunl-client/default.nix +++ b/pkgs/tools/networking/pritunl-client/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pritunl-client"; - version = "1.3.3343.50"; + version = "1.3.3370.14"; src = fetchFromGitHub { owner = "pritunl"; repo = "pritunl-client-electron"; rev = version; - sha256 = "sha256-xooTPJFtCIIQG8cibfqxGDTIzF2vjvmo8zteVNiHsGQ="; + sha256 = "sha256-/HXnD2P2fsNxWXMe5U7SUgxzOaHokktTogYIdiH8Kk8="; }; modRoot = "cli"; diff --git a/pkgs/tools/security/modsecurity/Makefile.am.patch b/pkgs/tools/security/modsecurity/Makefile.am.patch new file mode 100644 index 000000000000..6f2e2ed36454 --- /dev/null +++ b/pkgs/tools/security/modsecurity/Makefile.am.patch @@ -0,0 +1,17 @@ +--- a/apache2/Makefile.am ++++ b/apache2/Makefile.am +@@ -179,7 +179,6 @@ install-exec-hook: $(pkglib_LTLIBRARIES) + for m in $(pkglib_LTLIBRARIES); do \ + base=`echo $$m | sed 's/\..*//'`; \ + rm -f $(DESTDIR)$(pkglibdir)/$$base.*a; \ +- install -D -m444 $(DESTDIR)$(pkglibdir)/$$base.so $(DESTDIR)$(APXS_MODULES)/$$base.so; \ + done + else + install-exec-hook: $(pkglib_LTLIBRARIES) +@@ -187,6 +186,5 @@ install-exec-hook: $(pkglib_LTLIBRARIES) + for m in $(pkglib_LTLIBRARIES); do \ + base=`echo $$m | sed 's/\..*//'`; \ + rm -f $(DESTDIR)$(pkglibdir)/$$base.*a; \ +- cp -p $(DESTDIR)$(pkglibdir)/$$base.so $(DESTDIR)$(APXS_MODULES); \ + done + endif diff --git a/pkgs/tools/security/modsecurity/Makefile.in.patch b/pkgs/tools/security/modsecurity/Makefile.in.patch deleted file mode 100644 index 98384c754ce7..000000000000 --- a/pkgs/tools/security/modsecurity/Makefile.in.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/apache2/Makefile.in 2017-10-10 09:45:51.000000000 -0400 -+++ b/apache2/Makefile.in 2017-10-10 09:46:04.000000000 -0400 -@@ -1208,14 +1208,12 @@ - @LINUX_TRUE@ for m in $(pkglib_LTLIBRARIES); do \ - @LINUX_TRUE@ base=`echo $$m | sed 's/\..*//'`; \ - @LINUX_TRUE@ rm -f $(DESTDIR)$(pkglibdir)/$$base.*a; \ --@LINUX_TRUE@ install -D -m444 $(DESTDIR)$(pkglibdir)/$$base.so $(DESTDIR)$(APXS_MODULES)/$$base.so; \ - @LINUX_TRUE@ done - @LINUX_FALSE@install-exec-hook: $(pkglib_LTLIBRARIES) - @LINUX_FALSE@ @echo "Removing unused static libraries..."; \ - @LINUX_FALSE@ for m in $(pkglib_LTLIBRARIES); do \ - @LINUX_FALSE@ base=`echo $$m | sed 's/\..*//'`; \ - @LINUX_FALSE@ rm -f $(DESTDIR)$(pkglibdir)/$$base.*a; \ --@LINUX_FALSE@ cp -p $(DESTDIR)$(pkglibdir)/$$base.so $(DESTDIR)$(APXS_MODULES); \ - @LINUX_FALSE@ done - - # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index 1bbefd1342c3..431a6f9338ea 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchurl, pkg-config +{ stdenv, lib, fetchFromGitHub, pkg-config, autoreconfHook , curl, apacheHttpd, pcre, apr, aprutil, libxml2 -, luaSupport ? false, lua5 +, luaSupport ? false, lua5, perl }: with lib; @@ -11,14 +11,16 @@ in stdenv.mkDerivation rec { pname = "modsecurity"; - version = "2.9.3"; + version = "2.9.6"; - src = fetchurl { - url = "https://www.modsecurity.org/tarball/${version}/${pname}-${version}.tar.gz"; - sha256 = "0611nskd2y6yagrciqafxdn4rxbdk2v4swf45kc1sgwx2sfh34j1"; + src = fetchFromGitHub { + owner = "SpiderLabs"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-C/D/UWaI4GsXjfhLmNnYhRJoUvlsps1551SqhmZUc/4="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ curl apacheHttpd pcre apr aprutil libxml2 ] ++ optional luaSupport lua5; @@ -37,7 +39,10 @@ stdenv.mkDerivation rec { outputs = ["out" "nginx"]; # by default modsecurity's install script copies compiled output to httpd's modules folder # this patch removes those lines - patches = [ ./Makefile.in.patch ]; + patches = [ ./Makefile.am.patch ]; + + doCheck = true; + checkInputs = [ perl ]; postInstall = '' mkdir -p $nginx diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index 819112b53d34..d694a3cda0f7 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -17,6 +17,7 @@ let rev = "v0.3.7+satysfi"; sha256 = "0y8s0ij1vp1s4h5y1hn3ns76fzki2ba5ysqdib33akdav9krbj8p"; }; + propagatedBuildInputs = o.propagatedBuildInputs ++ [ ocamlPackages.result ]; }); yojson-with-position = ocamlPackages.buildDunePackage { pname = "yojson-with-position"; diff --git a/pkgs/tools/wayland/wpaperd/default.nix b/pkgs/tools/wayland/wpaperd/default.nix new file mode 100644 index 000000000000..433724bcf216 --- /dev/null +++ b/pkgs/tools/wayland/wpaperd/default.nix @@ -0,0 +1,36 @@ +{ lib, rustPlatform, fetchFromGitHub, pkg-config, libxkbcommon }: + +rustPlatform.buildRustPackage rec { + pname = "wpaperd"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "danyspin97"; + repo = pname; + rev = version; + sha256 = "n1zlC2afog0UazsJEBAzXpnhVDeP3xqpNGXlJ65umHQ="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + libxkbcommon + ]; + + cargoSha256 = "8ZMdbJvedDqoDr2rhKM1TMB5N4aRde04x/9H212fe68="; + + meta = with lib; { + description = "Minimal wallpaper daemon for Wayland"; + longDescription = '' + It allows the user to choose a different image for each output (aka for each monitor) + just as swaybg. Moreover, a directory can be chosen and wpaperd will randomly choose + an image from it. Optionally, the user can set a duration, after which the image + displayed will be changed with another random one. + ''; + homepage = "https://github.com/danyspin97/wpaperd"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ DPDmancul ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e312049b3dbe..39fa2fdfbf9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -185,9 +185,7 @@ with pkgs; meta.platforms = lib.platforms.linux; } ../build-support/setup-hooks/auto-patchelf.sh; - appflowy = callPackage ../applications/office/appflowy { - openssl = openssl_1_1; - }; + appflowy = callPackage ../applications/office/appflowy { }; appimageTools = callPackage ../build-support/appimage { buildFHSUserEnv = buildFHSUserEnvBubblewrap; @@ -3304,6 +3302,8 @@ with pkgs; plausible = callPackage ../servers/web-apps/plausible { }; + pam-reattach = callPackage ../os-specific/darwin/pam-reattach {}; + reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {}; skhd = callPackage ../os-specific/darwin/skhd { @@ -4001,6 +4001,8 @@ with pkgs; wob = callPackage ../tools/wayland/wob { }; + wpaperd = callPackage ../tools/wayland/wpaperd { }; + wshowkeys = callPackage ../tools/wayland/wshowkeys { }; wtype = callPackage ../tools/wayland/wtype { }; @@ -15378,9 +15380,7 @@ with pkgs; }; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; cargo-sync-readme = callPackage ../development/tools/rust/cargo-sync-readme {}; - cargo-tally = callPackage ../development/tools/rust/cargo-tally { - inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit; - }; + cargo-tally = callPackage ../development/tools/rust/cargo-tally { }; cargo-temp = callPackage ../development/tools/rust/cargo-temp { }; cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; @@ -38185,4 +38185,6 @@ with pkgs; aitrack = libsForQt5.callPackage ../applications/misc/aitrack { }; widevine-cdm = callPackage ../applications/networking/browsers/misc/widevine-cdm.nix { }; + + alsa-scarlett-gui = callPackage ../applications/audio/alsa-scarlett-gui { }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0530337d0a60..25b61f2477d4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1508,6 +1508,8 @@ self: super: with self; { caldav = callPackage ../development/python-modules/caldav { }; + calver = callPackage ../development/python-modules/calver { }; + callee = callPackage ../development/python-modules/callee { }; calmjs-parse = callPackage ../development/python-modules/calmjs-parse { }; @@ -6877,8 +6879,6 @@ self: super: with self; { pandas-stubs = callPackage ../development/python-modules/pandas-stubs { }; - parameterizedtestcase = callPackage ../development/python-modules/parameterizedtestcase { }; - pdunehd = callPackage ../development/python-modules/pdunehd { }; pencompy = callPackage ../development/python-modules/pencompy { }; @@ -7908,8 +7908,6 @@ self: super: with self; { pygmt = callPackage ../development/python-modules/pygmt { }; - pygobject2 = callPackage ../development/python-modules/pygobject { }; - pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { # inherit (pkgs) meson won't work because it won't be spliced inherit (pkgs.buildPackages) meson; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 534f9fa0490e..bfa5a304807f 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -9,16 +9,8 @@ with self; with super; { bootstrapped-pip = toPythonModule (callPackage ../development/python2-modules/bootstrapped-pip { }); - boto3 = callPackage ../development/python2-modules/boto3 {}; - - botocore = callPackage ../development/python2-modules/botocore {}; - - certifi = callPackage ../development/python2-modules/certifi { }; - cffi = callPackage ../development/python2-modules/cffi { inherit cffi; }; - chardet = callPackage ../development/python2-modules/chardet { }; - configparser = callPackage ../development/python2-modules/configparser { }; contextlib2 = callPackage ../development/python2-modules/contextlib2 { }; @@ -31,22 +23,12 @@ with self; with super; { futures = callPackage ../development/python2-modules/futures { }; - google-apputils = callPackage ../development/python2-modules/google-apputils { }; - - gtkme = callPackage ../development/python2-modules/gtkme { }; - hypothesis = callPackage ../development/python2-modules/hypothesis { }; - idna = callPackage ../development/python2-modules/idna { }; - importlib-metadata = callPackage ../development/python2-modules/importlib-metadata { }; jinja2 = callPackage ../development/python2-modules/jinja2 { }; - marisa = callPackage ../development/python2-modules/marisa { - inherit (pkgs) marisa; - }; - markupsafe = callPackage ../development/python2-modules/markupsafe { }; mock = callPackage ../development/python2-modules/mock { }; @@ -59,29 +41,16 @@ with self; with super; { pluggy = callPackage ../development/python2-modules/pluggy { }; - protobuf = callPackage ../development/python2-modules/protobuf { - disabled = isPyPy; - protobuf = pkgs.protobuf3_17; # last version compatible with Python 2 - }; - pycairo = callPackage ../development/python2-modules/pycairo { inherit (pkgs.buildPackages) meson; }; - pygments = callPackage ../development/python2-modules/Pygments { }; - - pygobject3 = callPackage ../development/python2-modules/pygobject { - inherit (pkgs) meson; - }; + pygobject2 = callPackage ../development/python2-modules/pygobject { }; pygtk = callPackage ../development/python2-modules/pygtk { }; pyparsing = callPackage ../development/python2-modules/pyparsing { }; - pyroma = callPackage ../development/python2-modules/pyroma { }; - - pysqlite = callPackage ../development/python2-modules/pysqlite { }; - pytest = pytest_4; pytest_4 = callPackage @@ -92,8 +61,6 @@ with self; with super; { }; }; - pytest-runner = callPackage ../development/python2-modules/pytest-runner { }; - pytest-xdist = callPackage ../development/python2-modules/pytest-xdist { }; recoll = disabled super.recoll; @@ -102,22 +69,12 @@ with self; with super; { rpm = disabled super.rpm; - s3transfer = callPackage ../development/python2-modules/s3transfer { }; - - scandir = callPackage ../development/python2-modules/scandir { }; - sequoia = disabled super.sequoia; setuptools = callPackage ../development/python2-modules/setuptools { }; setuptools-scm = callPackage ../development/python2-modules/setuptools-scm { }; - sphinxcontrib-websupport = callPackage ../development/python2-modules/sphinxcontrib-websupport { }; - - sphinx = callPackage ../development/python2-modules/sphinx { }; - - typing = callPackage ../development/python2-modules/typing { }; - zeek = disabled super.zeek; zipp = callPackage ../development/python2-modules/zipp { }; |