diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4fe7333b08fb..526d5e779d50 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14205,6 +14205,12 @@
github = "deifactor";
githubId = 30192992;
};
+ deinferno = {
+ name = "deinferno";
+ email = "14363193+deinferno@users.noreply.github.com";
+ github = "deinferno";
+ githubId = 14363193;
+ };
fzakaria = {
name = "Farid Zakaria";
email = "farid.m.zakaria@gmail.com";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index d1cda0d84e96..9d9f2e9057cc 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1256,6 +1256,7 @@
./virtualisation/virtualbox-guest.nix
./virtualisation/virtualbox-host.nix
./virtualisation/vmware-guest.nix
+ ./virtualisation/vmware-host.nix
./virtualisation/waydroid.nix
./virtualisation/xen-dom0.nix
./virtualisation/xe-guest-utilities.nix
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 8257eeb673b9..2f3866171873 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -8,6 +8,24 @@ let
cfg = config.services.udev;
+ initrdUdevRules = pkgs.runCommand "initrd-udev-rules" {} ''
+ mkdir -p $out/etc/udev/rules.d
+ for f in 60-cdrom_id 60-persistent-storage 75-net-description 80-drivers 80-net-setup-link; do
+ ln -s ${config.boot.initrd.systemd.package}/lib/udev/rules.d/$f.rules $out/etc/udev/rules.d
+ done
+ '';
+
+
+ # networkd link files are used early by udev to set up interfaces early.
+ # This must be done in stage 1 to avoid race conditions between udev and
+ # network daemons.
+ # TODO move this into the initrd-network module when it exists
+ initrdLinkUnits = pkgs.runCommand "initrd-link-units" {} ''
+ mkdir -p $out
+ ln -s ${udev}/lib/systemd/network/*.link $out/
+ ${lib.concatMapStringsSep "\n" (file: "ln -s ${file} $out/") (lib.mapAttrsToList (n: v: "${v.unit}/${n}") (lib.filterAttrs (n: _: hasSuffix ".link" n) config.systemd.network.units))}
+ '';
+
extraUdevRules = pkgs.writeTextFile {
name = "extra-udev-rules";
text = cfg.extraRules;
@@ -350,7 +368,10 @@ in
];
boot.initrd.systemd.storePaths = [
"${config.boot.initrd.systemd.package}/lib/systemd/systemd-udevd"
- "${config.boot.initrd.systemd.package}/lib/udev"
+ "${config.boot.initrd.systemd.package}/lib/udev/ata_id"
+ "${config.boot.initrd.systemd.package}/lib/udev/cdrom_id"
+ "${config.boot.initrd.systemd.package}/lib/udev/scsi_id"
+ "${config.boot.initrd.systemd.package}/lib/udev/rules.d"
] ++ map (x: "${x}/bin") config.boot.initrd.services.udev.binPackages;
# Generate the udev rules for the initrd
@@ -364,13 +385,17 @@ in
systemd = config.boot.initrd.systemd.package;
binPackages = config.boot.initrd.services.udev.binPackages ++ [ config.boot.initrd.systemd.contents."/bin".source ];
};
+ "/etc/systemd/network".source = initrdLinkUnits;
};
- # Insert custom rules
- boot.initrd.services.udev.packages = mkIf (config.boot.initrd.services.udev.rules != "") (pkgs.writeTextFile {
- name = "initrd-udev-rules";
- destination = "/etc/udev/rules.d/99-local.rules";
- text = config.boot.initrd.services.udev.rules;
- });
+ # Insert initrd rules
+ boot.initrd.services.udev.packages = [
+ initrdUdevRules
+ (mkIf (config.boot.initrd.services.udev.rules != "") (pkgs.writeTextFile {
+ name = "initrd-udev-rules";
+ destination = "/etc/udev/rules.d/99-local.rules";
+ text = config.boot.initrd.services.udev.rules;
+ }))
+ ];
environment.etc =
{
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 230ab673a976..d467c3c0471c 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -441,6 +441,7 @@ in
${flip concatMapStrings cfg.hostKeys (k: ''
if ! [ -s "${k.path}" ]; then
+ rm -f "${k.path}"
ssh-keygen \
-t "${k.type}" \
${if k ? bits then "-b ${toString k.bits}" else ""} \
diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix
index 2d817ca19234..a1855e1c1a79 100644
--- a/nixos/modules/services/web-apps/keycloak.nix
+++ b/nixos/modules/services/web-apps/keycloak.nix
@@ -540,7 +540,8 @@ in
db = if cfg.database.type == "postgresql" then "postgres" else cfg.database.type;
db-username = if databaseActuallyCreateLocally then "keycloak" else cfg.database.username;
db-password._secret = cfg.database.passwordFile;
- db-url-host = "${cfg.database.host}:${toString cfg.database.port}";
+ db-url-host = cfg.database.host;
+ db-url-port = toString cfg.database.port;
db-url-database = if databaseActuallyCreateLocally then "keycloak" else cfg.database.name;
db-url-properties = prefixUnlessEmpty "?" dbProps;
db-url = null;
diff --git a/nixos/modules/virtualisation/vmware-host.nix b/nixos/modules/virtualisation/vmware-host.nix
new file mode 100644
index 000000000000..faa0d455c9d6
--- /dev/null
+++ b/nixos/modules/virtualisation/vmware-host.nix
@@ -0,0 +1,166 @@
+{ config, pkgs, lib, ... }:
+
+let
+ cfg = config.virtualisation.vmware.host;
+ wrapperDir = "/run/vmware/bin"; # Perfectly fits as /usr/local/bin
+ parentWrapperDir = dirOf wrapperDir;
+ vmwareWrappers = # Needed as hardcoded paths workaround
+ let mkVmwareSymlink =
+ program:
+ ''
+ ln -s "${config.security.wrapperDir}/${program}" $wrapperDir/${program}
+ '';
+ in
+ [
+ (mkVmwareSymlink "pkexec")
+ (mkVmwareSymlink "mount")
+ (mkVmwareSymlink "umount")
+ ];
+in
+{
+ options = with lib; {
+ virtualisation.vmware.host = {
+ enable = mkEnableOption "VMware" // {
+ description = ''
+ This enables VMware host virtualisation for running VMs.
+
+
+ vmware-vmx will cause kcompactd0 due to
+ Transparent Hugepages feature in kernel.
+ Apply [ "transparent_hugepage=never" ] in
+ option to disable them.
+
+
+
+ If that didn't work disable TRANSPARENT_HUGEPAGE,
+ COMPACTION configs and recompile kernel.
+
+ '';
+ };
+ package = mkOption {
+ type = types.package;
+ default = pkgs.vmware-workstation;
+ defaultText = literalExpression "pkgs.vmware-workstation";
+ description = "VMware host virtualisation package to use";
+ };
+ extraPackages = mkOption {
+ type = with types; listOf package;
+ default = with pkgs; [ ];
+ description = "Extra packages to be used with VMware host.";
+ example = "with pkgs; [ ntfs3g ]";
+ };
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = "Add extra config to /etc/vmware/config";
+ example = ''
+ # Allow unsupported device's OpenGL and Vulkan acceleration for guest vGPU
+ mks.gl.allowUnsupportedDrivers = "TRUE"
+ mks.vk.allowUnsupportedDevices = "TRUE"
+ '';
+ };
+ };
+ };
+
+ config = lib.mkIf cfg.enable {
+ boot.extraModulePackages = [ config.boot.kernelPackages.vmware ];
+ boot.extraModprobeConfig = "alias char-major-10-229 fuse";
+ boot.kernelModules = [ "vmw_pvscsi" "vmw_vmci" "vmmon" "vmnet" "fuse" ];
+
+ environment.systemPackages = [ cfg.package ] ++ cfg.extraPackages;
+ services.printing.drivers = [ cfg.package ];
+
+ environment.etc."vmware/config".text = ''
+ ${builtins.readFile "${cfg.package}/etc/vmware/config"}
+ ${cfg.extraConfig}
+ '';
+
+ environment.etc."vmware/bootstrap".source = "${cfg.package}/etc/vmware/bootstrap";
+ environment.etc."vmware/icu".source = "${cfg.package}/etc/vmware/icu";
+ environment.etc."vmware-installer".source = "${cfg.package}/etc/vmware-installer";
+
+ # SUID wrappers
+
+ security.wrappers = {
+ vmware-vmx = {
+ setuid = true;
+ owner = "root";
+ group = "root";
+ source = "${cfg.package}/lib/vmware/bin/.vmware-vmx-wrapped";
+ };
+ };
+
+ ###### wrappers activation script
+
+ system.activationScripts.vmwareWrappers =
+ lib.stringAfter [ "specialfs" "users" ]
+ ''
+ mkdir -p "${parentWrapperDir}"
+ chmod 755 "${parentWrapperDir}"
+ # We want to place the tmpdirs for the wrappers to the parent dir.
+ wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)
+ chmod a+rx "$wrapperDir"
+ ${lib.concatStringsSep "\n" (vmwareWrappers)}
+ if [ -L ${wrapperDir} ]; then
+ # Atomically replace the symlink
+ # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/
+ old=$(readlink -f ${wrapperDir})
+ if [ -e "${wrapperDir}-tmp" ]; then
+ rm --force --recursive "${wrapperDir}-tmp"
+ fi
+ ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp"
+ mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}"
+ rm --force --recursive "$old"
+ else
+ # For initial setup
+ ln --symbolic "$wrapperDir" "${wrapperDir}"
+ fi
+ '';
+
+ # Services
+
+ systemd.services."vmware-authdlauncher" = {
+ description = "VMware Authentification Daemon";
+ serviceConfig = {
+ Type = "forking";
+ ExecStart = [ "${cfg.package}/bin/vmware-authdlauncher" ];
+ };
+ wantedBy = [ "multi-user.target" ];
+ };
+
+ systemd.services."vmware-networks-configuration" = {
+ description = "VMware Networks Configuration Generation";
+ unitConfig.ConditionPathExists = "!/etc/vmware/networking";
+ serviceConfig = {
+ UMask = "0077";
+ ExecStart = [
+ "${cfg.package}/bin/vmware-networks --postinstall vmware-player,0,1"
+ ];
+ Type = "oneshot";
+ RemainAfterExit = "yes";
+ };
+ wantedBy = [ "multi-user.target" ];
+ };
+
+ systemd.services."vmware-networks" = {
+ description = "VMware Networks";
+ after = [ "vmware-networks-configuration.service" ];
+ requires = [ "vmware-networks-configuration.service" ];
+ serviceConfig = {
+ Type = "forking";
+ ExecCondition = [ "${pkgs.kmod}/bin/modprobe vmnet" ];
+ ExecStart = [ "${cfg.package}/bin/vmware-networks --start" ];
+ ExecStop = [ "${cfg.package}/bin/vmware-networks --stop" ];
+ };
+ wantedBy = [ "multi-user.target" ];
+ };
+
+ systemd.services."vmware-usbarbitrator" = {
+ description = "VMware USB Arbitrator";
+ serviceConfig = {
+ ExecStart = [ "${cfg.package}/bin/vmware-usbarbitrator -f" ];
+ };
+ wantedBy = [ "multi-user.target" ];
+ };
+ };
+}
diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix
index 003813379e69..4083f5906d79 100644
--- a/nixos/tests/openssh.nix
+++ b/nixos/tests/openssh.nix
@@ -80,17 +80,21 @@ in {
client.wait_for_unit("network.target")
client.succeed(
- "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2"
+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2",
+ timeout=30
)
client.succeed(
- "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024"
+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024",
+ timeout=30
)
client.succeed(
- "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'echo hello world' >&2"
+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'echo hello world' >&2",
+ timeout=30
)
client.succeed(
- "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'ulimit -l' | grep 1024"
+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'ulimit -l' | grep 1024",
+ timeout=30
)
with subtest("configured-authkey"):
@@ -99,10 +103,12 @@ in {
)
client.succeed("chmod 600 privkey.snakeoil")
client.succeed(
- "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server true"
+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server true",
+ timeout=30
)
client.succeed(
- "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server_lazy true"
+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server_lazy true",
+ timeout=30
)
with subtest("localhost-only"):
diff --git a/nixos/tests/pgadmin4.nix b/nixos/tests/pgadmin4.nix
index 2f6dc3bd569f..b30299d307eb 100644
--- a/nixos/tests/pgadmin4.nix
+++ b/nixos/tests/pgadmin4.nix
@@ -1,53 +1,27 @@
-import ./make-test-python.nix ({ pkgs, lib, ... }:
+import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ... }:
+
+ /*
+ This test suite replaces the typical pytestCheckHook function in python
+ packages. Pgadmin4 test suite needs a running and configured postgresql
+ server. This is why this test exists.
+
+ To not repeat all the python dependencies needed, this test is called directly
+ from the pgadmin4 derivation, which also passes the currently
+ used propagatedBuildInputs and any python overrides.
+
+ Unfortunately, there doesn't seem to be an easy way to otherwise include
+ the needed packages here.
+
+ Due the the needed parameters a direct call to "nixosTests.pgadmin4" fails
+ and needs to be called as "pgadmin4.tests"
+
+ */
let
pgadmin4SrcDir = "/pgadmin";
pgadmin4Dir = "/var/lib/pgadmin";
pgadmin4LogDir = "/var/log/pgadmin";
- python-with-needed-packages = pkgs.python3.withPackages (ps: with ps; [
- selenium
- testtools
- testscenarios
- flask
- flask-babelex
- flask-babel
- flask-gravatar
- flask_login
- flask_mail
- flask_migrate
- flask_sqlalchemy
- flask_wtf
- flask-compress
- passlib
- pytz
- simplejson
- six
- sqlparse
- wtforms
- flask-paranoid
- psutil
- psycopg2
- python-dateutil
- sqlalchemy
- itsdangerous
- flask-security-too
- bcrypt
- cryptography
- sshtunnel
- ldap3
- gssapi
- flask-socketio
- eventlet
- httpagentparser
- user-agents
- wheel
- authlib
- qrcode
- pillow
- pyotp
- boto3
- ]);
in
{
name = "pgadmin4";
@@ -55,12 +29,27 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
nodes.machine = { pkgs, ... }: {
imports = [ ./common/x11.nix ];
+ # needed because pgadmin 6.8 will fail, if those dependencies get updated
+ nixpkgs.overlays = [
+ (self: super: {
+ pythonPackages = pythonEnv;
+ })
+ ];
+
environment.systemPackages = with pkgs; [
pgadmin4
postgresql
- python-with-needed-packages
chromedriver
chromium
+ # include the same packages as in pgadmin minus speaklater3
+ (python3.withPackages
+ (ps: buildDeps ++
+ [
+ # test suite package requirements
+ pythonPackages.testscenarios
+ pythonPackages.selenium
+ ])
+ )
];
services.postgresql = {
enable = true;
@@ -121,7 +110,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
with subtest("run browser test"):
machine.succeed(
'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
- && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg browser --exclude \
+ && python regression/runtests.py --pkg browser --exclude \
browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login'
)
@@ -131,13 +120,13 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
machine.succeed(
'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
&& export FONTCONFIG_FILE=${pkgs.makeFontsConf { fontDirectories = [];}} \
- && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg feature_tests'
+ && python regression/runtests.py --pkg feature_tests'
)
with subtest("run resql test"):
machine.succeed(
'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
- && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg resql'
+ && python regression/runtests.py --pkg resql'
)
'';
})
diff --git a/pkgs/applications/misc/kiln/default.nix b/pkgs/applications/misc/kiln/default.nix
index dfa114f446a1..2eb329dd5111 100644
--- a/pkgs/applications/misc/kiln/default.nix
+++ b/pkgs/applications/misc/kiln/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "kiln";
- version = "0.2.1";
+ version = "0.3.0";
src = fetchFromSourcehut {
owner = "~adnano";
repo = pname;
rev = version;
- hash = "sha256-c6ed62Nn++qw+U/DCiYeGwF77YsBxexWKZ7UQ3LE4fI=";
+ hash = "sha256-owON9ZNi8BufkeARjC6SwxzM81YJYu+bakhH5quzMrA=";
};
nativeBuildInputs = [ scdoc ];
- vendorSha256 = "sha256-bMpzebwbVHAbBtw0uuGyWd4wnM9z6tlsEQN4S/iucgk=";
+ vendorSha256 = "sha256-C1ueL/zmPzFbpNo5BF56/t74nwCUvb2Vu1exssPqOPE=";
installPhase = ''
runHook preInstall
diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix
index 273ca0245a2b..2b825705b006 100644
--- a/pkgs/applications/misc/libosmocore/default.nix
+++ b/pkgs/applications/misc/libosmocore/default.nix
@@ -1,16 +1,25 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
-, pcsclite, talloc, python2, gnutls
+{ lib, stdenv
+, autoreconfHook
+, fetchFromGitHub
+, gnutls
+, libmnl
+, libusb1
+, lksctp-tools
+, pcsclite
+, pkg-config
+, python3
+, talloc
}:
stdenv.mkDerivation rec {
pname = "libosmocore";
- version = "1.2.0";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "osmocom";
repo = "libosmocore";
rev = version;
- sha256 = "1535y6r4csvslrxcki80ya6zhhc5jw2nvy9bymb55ln77pf853vg";
+ hash = "sha256-AjOyZiLlXhsetbyMBuUssoNxk22LzGOkZpeLt4vKli4=";
};
propagatedBuildInputs = [
@@ -18,11 +27,17 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [
- autoreconfHook pkg-config
+ autoreconfHook
+ pkg-config
+ python3
];
buildInputs = [
- pcsclite python2 gnutls
+ gnutls
+ libmnl
+ libusb1
+ lksctp-tools
+ pcsclite
];
enableParallelBuilding = true;
diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix
index e8c6445d5f84..0f331ef6e2ce 100644
--- a/pkgs/applications/misc/skytemple/default.nix
+++ b/pkgs/applications/misc/skytemple/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "skytemple";
- version = "1.3.2";
+ version = "1.3.10";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
rev = version;
- sha256 = "1sx2rib0la3mifvh84ia3jnnq4qw9jxc13vxyidsdkp6x82nbvcg";
+ sha256 = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o=";
};
buildInputs = [
@@ -26,7 +26,10 @@ python3Packages.buildPythonApplication rec {
packaging
pycairo
pygal
+ psutil
+ gbulb
pypresence
+ sentry-sdk
setuptools
skytemple-dtef
skytemple-eventserver
diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix
index c6a79aa0e61e..34cc97023989 100644
--- a/pkgs/applications/misc/upwork/default.nix
+++ b/pkgs/applications/misc/upwork/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "upwork";
- version = "5.6.10.7";
+ version = "5.6.10.13";
src = fetchurl {
- url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_7_f806fd1250954801/${pname}_${version}_amd64.deb";
- sha256 = "6fe11cd53ffb66a02aa771153c4f58af34fea25847ee5bc13802fec9b0db0280";
+ url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_13_3c485d1dd2af4f61/${pname}_${version}_amd64.deb";
+ sha256 = "c3e1ecf14c99596f434edf93a2e08f031fbaa167025d1280cf19f68b829d6b79";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix
index db28952c31f2..578c08b207ed 100644
--- a/pkgs/applications/misc/xplr/default.nix
+++ b/pkgs/applications/misc/xplr/default.nix
@@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "xplr";
- version = "0.17.3";
+ version = "0.17.6";
src = fetchFromGitHub {
owner = "sayanarijit";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-BbD0Z/WGNaqpPowZqc4kmFLbL9/+JotKm7dWIgS3NjM=";
+ sha256 = "1lgfa1y5vsm3gqxizdgbn816klcamqmshw817mwan5i5yx9nk6xz";
};
buildInputs = lib.optional stdenv.isDarwin libiconv;
- cargoSha256 = "sha256-qsicWf15U5b4xMqkXDOrhGNrQmiZkoxBQwV58asQa8k=";
+ cargoSha256 = "sha256-va+MKnHVdkQNq1SFvvoYnb28tW61W7d97LoCMNzwZHE=";
meta = with lib; {
description = "A hackable, minimal, fast TUI file explorer";
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 0df1f31fb50d..bb994f7008f4 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -45,9 +45,9 @@
}
},
"ungoogled-chromium": {
- "version": "101.0.4951.41",
- "sha256": "0dzsbr309n70jg7fpq2qfnrgcm4553akvdmnzhss1fc85s467609",
- "sha256bin64": "12nzzsp4040mwc7jah5w0p58ckv8s16wv6ylf6vlmfby06a4xlkq",
+ "version": "101.0.4951.54",
+ "sha256": "1d808a7mvg0nd0mm20c1ny5kdvb2xvrs8vz4nnk456ix8pywcv62",
+ "sha256bin64": "1m6s6xf2wvz535w6jskk3pnibvsjpzmbxvd9rlxmqr08y219gp5y",
"deps": {
"gn": {
"version": "2022-03-14",
@@ -56,8 +56,8 @@
"sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"
},
"ungoogled-patches": {
- "rev": "101.0.4951.41-1",
- "sha256": "19m31bd04yvba3w5iymkxfjnmilas3cfp383m9fl6pd4wwhy9md0"
+ "rev": "101.0.4951.54-1",
+ "sha256": "0zhzy7llqddvym992pwhkgqh2f6ywjqqg0bhahl6c0np95gzhpbs"
}
}
}
diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index 566178d8305e..c75c5824283f 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cloudflared";
- version = "2022.4.1";
+ version = "2022.5.0";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
rev = version;
- hash = "sha256-dgvXbWtLP6sXBlqcx/xpw9LIbcE4VlYZQO5rrS34+9I=";
+ hash = "sha256-vz0fxSzx0vOpZy6/MVfZ467c9qdHUWZIL5wklTnnBBA=";
};
vendorSha256 = null;
diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix
index 3d8eed801ec3..3889082ec0c9 100644
--- a/pkgs/applications/networking/cluster/fluxcd/default.nix
+++ b/pkgs/applications/networking/cluster/fluxcd/default.nix
@@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let
- version = "0.29.5";
- sha256 = "1nqi7yk5d66fcjf6kyjivm3cbaqkj36ajgfvjm995q7cla2xyawm";
- manifestsSha256 = "09rq7wiv3ixdp0p8isfp26vikyx523arzdyizi6yb90q6dl6hgc0";
+ version = "0.30.2";
+ sha256 = "0z4f0vf2n7vfp6ff0lxcl5qyl65ihd4absad8cd16hncz15nyjgl";
+ manifestsSha256 = "04dlxzlrhggq54nkywn9nwdagdn43f0rb7cjkqdn3hlm4hwd07pb";
manifests = fetchzip {
url =
@@ -23,7 +23,7 @@ in buildGoModule rec {
inherit sha256;
};
- vendorSha256 = "sha256-dQV/8NF+sMiEoFr2wtR/oGqqn72JwH/JGbMREHIr/Tw=";
+ vendorSha256 = "sha256-POziJtCdD4klu23WuGmWdt72Ugr4KwCAjXRTCuzikSk=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests
@@ -65,6 +65,6 @@ in buildGoModule rec {
'';
homepage = "https://fluxcd.io";
license = licenses.asl20;
- maintainers = with maintainers; [ jlesquembre bryanasdev000 ];
+ maintainers = with maintainers; [ bryanasdev000 jlesquembre superherointj ];
};
}
diff --git a/pkgs/applications/networking/cluster/fluxcd/update.sh b/pkgs/applications/networking/cluster/fluxcd/update.sh
index 89bfbdc535e0..2d25eee6f347 100755
--- a/pkgs/applications/networking/cluster/fluxcd/update.sh
+++ b/pkgs/applications/networking/cluster/fluxcd/update.sh
@@ -35,7 +35,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
fi
# `git` flag here is to be used by local maintainers to speed up the bump process
- if [ "$1" = "git" ]; then
+ if [ $# -eq 1 ] && [ "$1" = "git" ]; then
git switch -c "package-fluxcd-${LATEST_VERSION}"
git add "$FLUXCD_PATH"/default.nix
git commit -m "fluxcd: ${OLD_VERSION} -> ${LATEST_VERSION}"
diff --git a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix
index 2caa0dc22808..1fd71cb8e991 100644
--- a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix
+++ b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix
@@ -1,13 +1,13 @@
{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli, unzip }:
let
- ver = "1.2.54.0";
+ ver = "1.2.312.0";
source =
if stdenv.isDarwin then {
url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip";
- sha256 = "kgxoQrtu2tsV5t/3oA+Z2juY24hPOznPGjlQMsqOIZg=";
+ sha256 = "50aac34a4dedddf20c20be24989ee5d33b46a72187791715fb9b395b54db8ef9";
} else {
url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb";
- sha256 = "uug1cT4yRxNQcf+zWz0mi72G4EGa3eZHVuG36INSqrM=";
+ sha256 = "2e51ce5bf8f23a1e590fff866bbdadcf82aa03c5054c671d9115482a1b263cc7";
};
archivePath = if stdenv.isDarwin then "sessionmanager-bundle" else "usr/local/sessionmanagerplugin";
in
diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/applications/networking/firewalld/default.nix
new file mode 100644
index 000000000000..b937c35a3f96
--- /dev/null
+++ b/pkgs/applications/networking/firewalld/default.nix
@@ -0,0 +1,104 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, bash
+, docbook_xml_dtd_42
+, docbook-xsl-nons
+, glib
+, gobject-introspection
+, gtk3
+, intltool
+, libnotify
+, libxml2
+, libxslt
+, networkmanagerapplet
+, pkg-config
+, python3
+, wrapGAppsNoGuiHook
+, withGui ? false
+}:
+
+let
+ pythonPath = python3.withPackages (ps: with ps; [
+ dbus-python
+ nftables
+ pygobject3
+ ] ++ lib.optionals withGui [
+ pyqt5
+ pyqt5_sip
+ ]);
+in
+stdenv.mkDerivation rec {
+ pname = "firewalld";
+ version = "1.1.1";
+
+ src = fetchFromGitHub {
+ owner = "firewalld";
+ repo = "firewalld";
+ rev = "v${version}";
+ sha256 = "sha256-w8TbovIhOhJAUZWbKdBd/+db8Hro/ttlxWZDcrCXX4Q=";
+ };
+
+ patches = [
+ ./respect-xml-catalog-files-var.patch
+ ];
+
+ postPatch = ''
+ substituteInPlace src/firewall/config/__init__.py.in \
+ --replace "/usr/share" "$out/share"
+
+ for file in config/firewall-{applet,config}.desktop.in; do
+ substituteInPlace $file \
+ --replace "/usr/bin/" "$out/bin/"
+ done
+ '' + lib.optionalString withGui ''
+ substituteInPlace src/firewall-applet.in \
+ --replace "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-conenction-editor"
+ '';
+
+ nativeBuildInputs = [
+ autoreconfHook
+ docbook_xml_dtd_42
+ docbook-xsl-nons
+ glib
+ intltool
+ libxml2
+ libxslt
+ pkg-config
+ python3
+ python3.pkgs.wrapPython
+ ] ++ lib.optionals withGui [
+ gobject-introspection
+ wrapGAppsNoGuiHook
+ ];
+
+ buildInputs = [
+ bash
+ glib
+ ] ++ lib.optionals withGui [
+ gtk3
+ libnotify
+ pythonPath
+ ];
+
+ dontWrapGApps = true;
+
+ preFixup = lib.optionalString withGui ''
+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+ '';
+
+ postFixup = ''
+ chmod +x $out/share/firewalld/*.py $out/share/firewalld/testsuite/python/*.py $out/share/firewalld/testsuite/{,integration/}testsuite
+ patchShebangs --host $out/share/firewalld/testsuite/{,integration/}testsuite $out/share/firewalld/*.py
+ wrapPythonProgramsIn "$out/bin" "$out ${pythonPath}"
+ wrapPythonProgramsIn "$out/share/firewalld/testsuite/python" "$out ${pythonPath}"
+ '';
+
+ meta = with lib; {
+ description = "Firewall daemon with D-Bus interface";
+ homepage = "https://github.com/firewalld/firewalld";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patch b/pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patch
new file mode 100644
index 000000000000..03a10121c6be
--- /dev/null
+++ b/pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patch
@@ -0,0 +1,13 @@
+--- a/m4/jh_path_xml_catalog.m4
++++ b/m4/jh_path_xml_catalog.m4
+@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG],
+ [
+ AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
+ AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
+- if $jh_found_xmlcatalog && \
+- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
++ # empty argument forces libxml to use XML_CATALOG_FILES variable
++ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then
+ AC_MSG_RESULT([found])
+ ifelse([$3],,,[$3
+ ])dnl
diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index f4d79d00d8b1..adda284a6b8c 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -9,7 +9,9 @@ mkDerivation rec {
src = fetchFromGitHub {
owner = "haiwen";
repo = "seafile-client";
- rev = "v${version}";
+ # Tag v8.0.7 used to point to this commit, but was re-tagged later to a state
+ # that fails to link properly
+ rev = "8b96abf64e6aa19e3beeff6b322bcd6d28120bdd";
sha256 = "00wfr7dvbyl7pg1xgssgz8a94c7c4n5r9266lhy9qcbz456hdcgj";
};
diff --git a/pkgs/applications/networking/zerobin/default.nix b/pkgs/applications/networking/zerobin/default.nix
index 56d5274751fc..ca55085d8085 100644
--- a/pkgs/applications/networking/zerobin/default.nix
+++ b/pkgs/applications/networking/zerobin/default.nix
@@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec {
# relax version constraints of some dependencies
substituteInPlace setup.cfg \
--replace "clize==4.1.1" "clize" \
- --replace "bleach==3.1.5" "bleach>=3.1.5,<5" \
+ --replace "bleach==3.1.5" "bleach>=3.1.5,<6" \
--replace "bottle==0.12.18" "bottle>=0.12.18,<1" \
--replace "Paste==3.4.3" "Paste>=3.4.3,<4"
'';
diff --git a/pkgs/applications/office/libreoffice/soffice-template.desktop b/pkgs/applications/office/libreoffice/soffice-template.desktop
new file mode 100644
index 000000000000..4adb91284a95
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/soffice-template.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=LibreOffice @app@...
+Comment=Enter LibreOffice @app@ filename:
+Type=Link
+URL=.source/soffice.@ext@
+Icon=libreoffice-oasis-@type@
diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix
index 08b01a4a051b..fd9ef63dc73f 100644
--- a/pkgs/applications/office/libreoffice/wrapper.nix
+++ b/pkgs/applications/office/libreoffice/wrapper.nix
@@ -1,19 +1,32 @@
-{ libreoffice, runCommand, dbus, bash }:
-let
- jdk = libreoffice.jdk;
-in
-(runCommand libreoffice.name {
- inherit dbus libreoffice jdk bash;
-} ''
+{ lib, runCommand
+, libreoffice, dbus, bash, substituteAll
+, dolphinTemplates ? true
+}:
+runCommand libreoffice.name {
+ inherit (libreoffice) jdk meta;
+ inherit dbus libreoffice bash;
+} (''
mkdir -p "$out/bin"
- ln -s "${libreoffice}/share" "$out/share"
substituteAll "${./wrapper.sh}" "$out/bin/soffice"
chmod a+x "$out/bin/soffice"
for i in $(ls "${libreoffice}/bin/"); do
test "$i" = "soffice" || ln -s soffice "$out/bin/$(basename "$i")"
done
-'') // {
- inherit libreoffice dbus;
- meta = libreoffice.meta;
-}
+
+ mkdir -p "$out/share"
+ ln -s "${libreoffice}/share"/* $out/share
+'' + lib.optionalString dolphinTemplates ''
+ # Add templates to dolphin "Create new" menu - taken from debian
+
+ # We need to unpack the core source since the necessary files aren't available in the libreoffice output
+ unpackFile "${libreoffice.src}"
+
+ install -D "${libreoffice.name}"/extras/source/shellnew/soffice.* --target-directory="$out/share/templates/.source"
+
+ cp ${substituteAll {src = ./soffice-template.desktop; app="Writer"; ext="odt"; type="text"; }} $out/share/templates/soffice.odt.desktop
+ cp ${substituteAll {src = ./soffice-template.desktop; app="Calc"; ext="ods"; type="spreadsheet"; }} $out/share/templates/soffice.ods.desktop
+ cp ${substituteAll {src = ./soffice-template.desktop; app="Impress"; ext="odp"; type="presentation";}} $out/share/templates/soffice.odp.desktop
+ cp ${substituteAll {src = ./soffice-template.desktop; app="Draw"; ext="odg"; type="drawing"; }} $out/share/templates/soffice.odg.desktop
+'')
+
diff --git a/pkgs/applications/virtualization/vmware-workstation/default.nix b/pkgs/applications/virtualization/vmware-workstation/default.nix
new file mode 100755
index 000000000000..58cd4092a95d
--- /dev/null
+++ b/pkgs/applications/virtualization/vmware-workstation/default.nix
@@ -0,0 +1,341 @@
+{ stdenv
+, buildFHSUserEnv
+, fetchurl
+, lib
+, zlib
+, gdbm
+, bzip2
+, libxslt
+, libxml2
+, libuuid
+, readline
+, xz
+, cups
+, glibc
+, libaio
+, vulkan-loader
+, alsa-lib
+, libpulseaudio
+, libGL
+, numactl
+, libX11
+, libXi
+, kmod
+, python3
+, autoPatchelfHook
+, makeWrapper
+, sqlite
+, enableInstaller ? false
+}:
+
+let
+ vmware-unpack-env = buildFHSUserEnv rec {
+ name = "vmware-unpack-env";
+ targetPkgs = pkgs: [ zlib ];
+ };
+ gdbm3 = gdbm.overrideAttrs (old: rec {
+ version = "1.8.3";
+
+ src = fetchurl {
+ url = "mirror://gnu/gdbm/gdbm-${version}.tar.gz";
+ sha256 = "sha256-zDQDOKLii0AFirnrU1SiHVP4ihWC6iG6C7GFw3ooHck=";
+ };
+
+ installPhase = ''
+ mkdir -p $out/lib
+ cp .libs/libgdbm*.so* $out/lib/
+ '';
+ });
+in
+stdenv.mkDerivation rec {
+ pname = "vmware-workstation";
+ version = "16.2.3";
+ build = "19376536";
+
+ buildInputs = [
+ libxslt
+ libxml2
+ libuuid
+ gdbm3
+ readline
+ xz
+ cups
+ glibc
+ libaio
+ vulkan-loader
+ alsa-lib
+ libpulseaudio
+ libGL
+ numactl
+ libX11
+ libXi
+ kmod
+ ];
+
+ nativeBuildInputs = [ python3 vmware-unpack-env autoPatchelfHook makeWrapper ]
+ ++ lib.optionals enableInstaller [ sqlite bzip2 ];
+
+ src = fetchurl {
+ url = "https://download3.vmware.com/software/WKST-1623-LX-New/VMware-Workstation-Full-${version}-${build}.x86_64.bundle";
+ sha256 = "sha256-+JE1KnRfawcaBannIyEr1TNZTF7YXRYYaFMVq0/erbM=";
+ };
+
+ unpackPhase = ''
+ ${vmware-unpack-env}/bin/vmware-unpack-env -c "sh ${src} --extract unpacked"
+ '';
+
+ installPhase = ''
+ mkdir -p \
+ $out/bin \
+ $out/etc/vmware \
+ $out/etc/init.d \
+ $out/lib/vmware \
+ $out/share/doc
+
+ #### Replicate vmware-installer's order but VMX first because of appLoader
+ ${lib.optionalString enableInstaller ''
+ ## VMware installer
+ echo "Installing VMware Installer"
+ unpacked="unpacked/vmware-installer"
+ vmware_installer_version=$(cat "unpacked/vmware-installer/manifest.xml" | grep -oPm1 "(?<=)[^<]+")
+ dest="$out/lib/vmware-installer/$vmware_installer_version"
+
+ mkdir -p $dest
+ cp -r $unpacked/vmis* $dest/
+ cp -r $unpacked/sopython $dest/
+ cp -r $unpacked/python $dest/
+ cp -r $unpacked/cdsHelper $dest/
+ cp -r $unpacked/vmware* $dest/
+ cp -r $unpacked/bin $dest/
+ cp -r $unpacked/lib $dest/
+
+ chmod +x $dest/vmis-launcher $dest/sopython/* $dest/python/init.sh $dest/vmware-*
+ ln -s $dest/vmware-installer $out/bin/vmware-installer
+
+ mkdir -p $out/etc/vmware-installer
+ cp ${./vmware-installer-bootstrap} $out/etc/vmware-installer/bootstrap
+ sed -i -e "s,@@INSTALLERDIR@@,$dest," $out/etc/vmware-installer/bootstrap
+ sed -i -e "s,@@IVERSION@@,$vmware_installer_version," $out/etc/vmware-installer/bootstrap
+ sed -i -e "s,@@BUILD@@,${build}," $out/etc/vmware-installer/bootstrap
+
+ # create database of vmware guest tools (avoids vmware fetching them later)
+ mkdir -p $out/etc/vmware-installer/components
+ database_filename=$out/etc/vmware-installer/database
+ touch $database_filename
+ sqlite3 "$database_filename" "CREATE TABLE settings(key VARCHAR PRIMARY KEY, value VARCHAR NOT NULL, component_name VARCHAR NOT NULL);"
+ sqlite3 "$database_filename" "INSERT INTO settings(key,value,component_name) VALUES('db.schemaVersion','2','vmware-installer');"
+ sqlite3 "$database_filename" "CREATE TABLE components(id INTEGER PRIMARY KEY, name VARCHAR NOT NULL, version VARCHAR NOT NULL, buildNumber INTEGER NOT NULL, component_core_id INTEGER NOT NULL, longName VARCHAR NOT NULL, description VARCHAR, type INTEGER NOT NULL);"
+ for folder in unpacked/**/.installer ; do
+ component="$(basename $(dirname $folder))"
+ component_version=$(cat unpacked/$component/manifest.xml | grep -oPm1 "(?<=)[^<]+")
+ component_core_id=$([ "$component" == "vmware-installer" ] && echo "-1" || echo "1")
+ type=$([ "$component" == "vmware-workstation" ] && echo "0" || echo "1")
+ sqlite3 "$database_filename" "INSERT INTO components(name,version,buildNumber,component_core_id,longName,description,type) VALUES(\"$component\",\"$component_version\",\"${build}\",$component_core_id,\"$component\",\"$component\",$type);"
+ mkdir -p $out/etc/vmware-installer/components/$component
+ cp -r $folder/* $out/etc/vmware-installer/components/$component
+ done
+ ''}
+
+ ## VMware Bootstrap
+ echo "Installing VMware Bootstrap"
+ cp ${./vmware-bootstrap} $out/etc/vmware/bootstrap
+ sed -i -e "s,@@PREFIXDIR@@,$out," $out/etc/vmware/bootstrap
+
+ ## VMware Config
+ echo "Installing VMware Config"
+ cp ${./vmware-config} $out/etc/vmware/config
+ sed -i -e "s,@@VERSION@@,${version}," $out/etc/vmware/config
+ sed -i -e "s,@@BUILD@@,${build}," $out/etc/vmware/config
+ sed -i -e "s,@@PREFIXDIR@@,$out," $out/etc/vmware/config
+
+ ## VMware VMX
+ echo "Installing VMware VMX"
+ unpacked="unpacked/vmware-vmx"
+ cp -r $unpacked/bin/* $out/bin/
+ cp -r $unpacked/etc/modprobe.d $out/etc/
+ cp -r $unpacked/etc/init.d/* $out/etc/init.d/
+ cp -r $unpacked/roms $out/lib/vmware/
+ cp -r $unpacked/sbin/* $out/bin/
+
+ cp -r $unpacked/lib/libconf $out/lib/vmware/
+ cp -r $unpacked/lib/bin $out/lib/vmware/
+ cp -r $unpacked/lib/lib $out/lib/vmware/
+ cp -r $unpacked/lib/scripts $out/lib/vmware/
+ cp -r $unpacked/lib/icu $out/lib/vmware/
+ cp -r $unpacked/lib/share $out/lib/vmware/
+ cp -r $unpacked/lib/modules $out/lib/vmware/
+ cp -r $unpacked/lib/include $out/lib/vmware/
+
+ cp -r $unpacked/extra/checkvm $out/bin/
+ cp -r $unpacked/extra/modules.xml $out/lib/vmware/modules/
+
+ ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-vmblock-fuse
+ ln -s $out/lib/vmware/icu $out/etc/vmware/icu
+
+ # Replace vmware-modconfig with simple error dialog
+ cp ${./vmware-modconfig} $out/bin/vmware-modconfig
+ sed -i -e "s,ETCDIR=/etc/vmware,ETCDIR=$out/etc/vmware," $out/bin/vmware-modconfig
+
+ # Patch dynamic libs in
+ for binary in "mksSandbox" "mksSandbox-debug" "mksSandbox-stats" "vmware-vmx" "vmware-vmx-debug" "vmware-vmx-stats"
+ do
+ patchelf \
+ --add-needed ${libaio}/lib/libaio.so.1 \
+ --add-needed ${vulkan-loader}/lib/libvulkan.so.1 \
+ --add-needed ${alsa-lib}/lib/libasound.so \
+ --add-needed ${libpulseaudio}/lib/libpulse.so.0 \
+ --add-needed ${libGL}/lib/libEGL.so.1 \
+ --add-needed ${numactl}/lib/libnuma.so.1 \
+ --add-needed ${libX11}/lib/libX11.so.6 \
+ --add-needed ${libXi}/lib/libXi.so.6 \
+ --add-needed ${libGL}/lib/libGL.so.1 \
+ $out/lib/vmware/bin/$binary
+ done
+
+ ## VMware USB Arbitrator
+ echo "Installing VMware USB Arbitrator"
+ unpacked="unpacked/vmware-usbarbitrator"
+ cp -r $unpacked/etc/init.d/* $out/etc/init.d/
+ cp -r $unpacked/bin/* $out/bin/
+ ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-usbarbitrator
+
+ ## VMware Player Setup
+ echo "Installing VMware Player Setup"
+ unpacked="unpacked/vmware-player-setup"
+ mkdir -p $out/lib/vmware/setup
+ cp $unpacked/vmware-config $out/lib/vmware/setup/
+
+ ## VMware Network Editor
+ echo "Installing VMware Network Editor"
+ unpacked="unpacked/vmware-network-editor"
+ cp -r $unpacked/lib $out/lib/vmware/
+
+ ## VMware Tools + Virtual Printer
+ echo "Installing VMware Tools + Virtual Printer"
+ mkdir -p $out/lib/vmware/isoimages/
+ cp unpacked/vmware-tools-linuxPreGlibc25/linuxPreGlibc25.iso \
+ unpacked/vmware-tools-windows/windows.iso \
+ unpacked/vmware-tools-winPreVista/winPreVista.iso \
+ unpacked/vmware-virtual-printer/VirtualPrinter-Linux.iso \
+ unpacked/vmware-virtual-printer/VirtualPrinter-Windows.iso \
+ unpacked/vmware-tools-winPre2k/winPre2k.iso \
+ unpacked/vmware-tools-linux/linux.iso \
+ unpacked/vmware-tools-netware/netware.iso \
+ unpacked/vmware-tools-solaris/solaris.iso \
+ $out/lib/vmware/isoimages/
+
+ ## VMware Player Application
+ echo "Installing VMware Player Application"
+ unpacked="unpacked/vmware-player-app"
+ cp -r $unpacked/lib/* $out/lib/vmware/
+ cp -r $unpacked/etc/* $out/etc/
+ cp -r $unpacked/share/* $out/share/
+ cp -r $unpacked/bin/* $out/bin/
+ cp -r $unpacked/doc/* $out/share/doc/ # Licences
+
+ mkdir -p $out/etc/thnuclnt
+ cp -r $unpacked/extras/.thnumod $out/etc/thnuclnt/
+
+ mkdir -p $out/lib/cups/filter
+ cp -r $unpacked/extras/thnucups $out/lib/cups/filter/
+
+ for target in "vmplayer" "vmware-enter-serial" "vmware-setup-helper" "licenseTool" "vmware-mount" "vmware-fuseUI" "vmware-app-control" "vmware-zenity"
+ do
+ ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/$target
+ done
+
+ ln -s $out/lib/vmware/bin/vmware-mount $out/bin/vmware-mount
+ ln -s $out/lib/vmware/bin/vmware-fuseUI $out/bin/vmware-fuseUI
+ ln -s $out/lib/vmware/bin/vmrest $out/bin/vmrest
+
+ # Patch vmplayer
+ sed -i -e "s,ETCDIR=/etc/vmware,ETCDIR=$out/etc/vmware," $out/bin/vmplayer
+ sed -i -e "s,/sbin/modprobe,${kmod}/bin/modprobe," $out/bin/vmplayer
+ sed -i -e "s,@@BINARY@@,$out/bin/vmplayer," $out/share/applications/vmware-player.desktop
+
+ ## VMware OVF Tool compoment
+ echo "Installing VMware OVF Tool for Linux"
+ unpacked="unpacked/vmware-ovftool"
+ mkdir -p $out/lib/vmware-ovftool/
+
+ cp -r $unpacked/* $out/lib/vmware-ovftool/
+ chmod 755 $out/lib/vmware-ovftool/ovftool*
+ makeWrapper "$out/lib/vmware-ovftool/ovftool.bin" "$out/bin/ovftool"
+
+ ## VMware Network Editor User Interface
+ echo "Installing VMware Network Editor User Interface"
+ unpacked="unpacked/vmware-network-editor-ui"
+ cp -r $unpacked/share/* $out/share/
+
+ ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-netcfg
+ ln -s $out/lib/vmware/bin/vmware-netcfg $out/bin/vmware-netcfg
+
+ # Patch network editor ui
+
+ sed -i -e "s,@@BINARY@@,$out/bin/vmware-netcfg," $out/share/applications/vmware-netcfg.desktop
+
+ ## VMware VIX Core Library
+ echo "Installing VMware VIX Core Library"
+ unpacked="unpacked/vmware-vix-core"
+ mkdir -p $out/lib/vmware-vix
+ cp -r $unpacked/lib/* $out/lib/vmware-vix/
+ cp -r $unpacked/bin/* $out/bin/
+ cp $unpacked/*.txt $out/lib/vmware-vix/
+
+ mkdir -p $out/share/doc/vmware-vix/
+ cp -r $unpacked/doc/* $out/share/doc/vmware-vix/
+
+ mkdir -p $out/include/
+ cp -r $unpacked/include/* $out/include/
+
+ ## VMware VIX Workstation-16.0.0 Library
+ echo "Installing VMware VIX Workstation-16.0.0 Library"
+ unpacked="unpacked/vmware-vix-lib-Workstation1600"
+ cp -r $unpacked/lib/* $out/lib/vmware-vix/
+
+ ## VMware VProbes component for Linux
+ echo "Installing VMware VProbes component for Linux"
+ unpacked="unpacked/vmware-vprobe"
+ cp -r $unpacked/bin/* $out/bin/
+ cp -r $unpacked/lib/* $out/lib/vmware/
+
+ ## VMware Workstation
+ echo "Installing VMware Workstation"
+ unpacked="unpacked/vmware-workstation"
+ cp -r $unpacked/bin/* $out/bin/
+ cp -r $unpacked/lib/* $out/lib/vmware/
+ cp -r $unpacked/share/* $out/share/
+ cp -r $unpacked/man $out/share/
+ cp -r $unpacked/doc $out/share/
+
+ ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware
+ ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-tray
+ ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-vprobe
+
+ # Patch vmware
+ sed -i -e "s,ETCDIR=/etc/vmware,ETCDIR=$out/etc/vmware,g" $out/bin/vmware
+ sed -i -e "s,/sbin/modprobe,${kmod}/bin/modprobe,g" $out/bin/vmware
+ sed -i -e "s,@@BINARY@@,$out/bin/vmware," $out/share/applications/vmware-workstation.desktop
+
+ chmod +x $out/bin/* $out/lib/vmware/bin/* $out/lib/vmware/setup/*
+
+ # Harcoded pkexec hack
+ for lib in "lib/vmware/lib/libvmware-mount.so/libvmware-mount.so" "lib/vmware/lib/libvmwareui.so/libvmwareui.so" "lib/vmware/lib/libvmware-fuseUI.so/libvmware-fuseUI.so"
+ do
+ sed -i -e "s,/usr/local/sbin,/run/vmware/bin," "$out/$lib"
+ done
+
+ # SUID hack
+ wrapProgram $out/lib/vmware/bin/vmware-vmx
+ rm $out/lib/vmware/bin/vmware-vmx
+ ln -s /run/wrappers/bin/vmware-vmx $out/lib/vmware/bin/vmware-vmx
+ '';
+
+ meta = with lib; {
+ description = "Industry standard desktop hypervisor for x86-64 architecture";
+ homepage = "https://www.vmware.com/products/workstation-pro.html";
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ deinferno ];
+ };
+}
diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap b/pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap
new file mode 100644
index 000000000000..93787870ec3c
--- /dev/null
+++ b/pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap
@@ -0,0 +1,11 @@
+PREFIX="@@PREFIXDIR@@"
+BINDIR="@@PREFIXDIR@@/bin"
+SBINDIR="@@PREFIXDIR@@/sbin"
+LIBDIR="@@PREFIXDIR@@/lib"
+DATADIR="@@PREFIXDIR@@/share"
+SYSCONFDIR="@@PREFIXDIR@@/etc"
+DOCDIR="@@PREFIXDIR@@/share/doc"
+MANDIR="@@PREFIXDIR@@/share/man"
+INCLUDEDIR="@@PREFIXDIR@@/include"
+INITDIR="@@PREFIXDIR@@/etc"
+INITSCRIPTDIR="@@PREFIXDIR@@/etc/init.d"
diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-config b/pkgs/applications/virtualization/vmware-workstation/vmware-config
new file mode 100644
index 000000000000..9b3714bc3136
--- /dev/null
+++ b/pkgs/applications/virtualization/vmware-workstation/vmware-config
@@ -0,0 +1,21 @@
+.encoding = "UTF-8"
+product.name = "VMware Workstation"
+product.version = "@@VERSION@@"
+product.buildNumber = "@@BUILD@@"
+workstation.product.version = "@@VERSION@@"
+player.product.version = "@@VERSION@@"
+vix.config.version = "1"
+bindir = "@@PREFIXDIR@@/bin"
+libdir = "@@PREFIXDIR@@/lib/vmware"
+vix.libdir = "@@PREFIXDIR@@/lib/vmware-vix"
+initscriptdir = "@@PREFIXDIR@@/lib/systemd/scripts"
+vmware.fullpath = "@@PREFIXDIR@@/bin/vmware"
+authd.fullpath = "@@PREFIXDIR@@/bin/vmware-authd"
+gksu.rootMethod = "su"
+NETWORKING = "yes"
+installerDefaults.autoSoftwareUpdateEnabled = "no"
+installerDefaults.dataCollectionEnabled = "no"
+installerDefaults.componentDownloadEnabled = "no"
+installerDefaults.transferVersion = "1"
+acceptOVFEULA = "yes"
+acceptEULA = "yes"
diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap b/pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap
new file mode 100644
index 000000000000..4db8f7a1b458
--- /dev/null
+++ b/pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap
@@ -0,0 +1,5 @@
+VMWARE_INSTALLER="@@INSTALLERDIR@@"
+VERSION="@@IVERSION@@" # For backwards compability
+VMISVERSION="@@IVERSION@@"
+VMISBUILDNUM="@@BUILD@@"
+VMISPYVERSION="39"
diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-modconfig b/pkgs/applications/virtualization/vmware-workstation/vmware-modconfig
new file mode 100644
index 000000000000..c93a37157966
--- /dev/null
+++ b/pkgs/applications/virtualization/vmware-workstation/vmware-modconfig
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+ETCDIR=/etc/vmware
+. $ETCDIR/bootstrap
+
+exec "$LIBDIR"/vmware/bin/vmware-zenity --error --text "Reboot is required to load VMware kernel modules (make sure that 'virtualisation.vmware.host.enable' is enabled)"
diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix
deleted file mode 100644
index 5b93357b2665..000000000000
--- a/pkgs/development/interpreters/pixie/default.nix
+++ /dev/null
@@ -1,94 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, fetchurl, python2, makeWrapper, pkg-config, gcc,
- pypy, libffi, libedit, libuv, boost, zlib,
- variant ? "jit", buildWithPypy ? false }:
-
-let
- commit-count = "1364";
- common-flags = "--thread --gcrootfinder=shadowstack --continuation";
- variants = {
- jit = { flags = "--opt=jit"; target = "target.py"; };
- jit-preload = { flags = "--opt=jit"; target = "target_preload.py"; };
- no-jit = { flags = ""; target = "target.py"; };
- no-jit-preload = { flags = ""; target = "target_preload.py"; };
- };
- pixie-src = fetchFromGitHub {
- owner = "pixie-lang";
- repo = "pixie";
- rev = "5eb0ccbe8b0087d3a5f2d0bbbc6998d624d3cd62";
- sha256 = "sha256-dQ8ncH0IqU42WYxwBgjH6QQfvMIo7RZpv81UAUsPw10=";
- };
- pypy-tag = "91db1a9";
- pypy-src = fetchurl {
- name = "pypy-src-${pypy-tag}";
- url = "https://bitbucket.org/pypy/pypy/get/${pypy-tag}.tar.bz2";
- sha256 = "0ylbqvhbcp5m09l15i2q2h3a0vjd055x2r37cq71lkhgmmaxrwbq";
- };
- libs = [ libffi libedit libuv boost.dev boost.out zlib ];
- include-path = lib.concatStringsSep ":"
- (map (p: "${p}/include") libs);
- library-path = lib.concatStringsSep ":"
- (map (p: "${p}/lib") libs);
- bin-path = lib.concatStringsSep ":"
- (map (p: "${p}/bin") [ gcc ]);
- build = {flags, target}: stdenv.mkDerivation rec {
- pname = "pixie";
- version = "0-r${commit-count}-${variant}";
- nativeBuildInputs = [ makeWrapper pkg-config ];
- buildInputs = libs;
- PYTHON = if buildWithPypy
- then "${pypy}/pypy-c/pypy-c"
- else python2.interpreter;
- unpackPhase = ''
- cp -R ${pixie-src} pixie-src
- mkdir pypy-src
- (cd pypy-src
- tar --strip-components=1 -xjf ${pypy-src})
- chmod -R +w pypy-src pixie-src
- '';
- patchPhase = ''
- (cd pixie-src
- patch -p1 < ${./load_paths.patch}
- libraryPaths='["${libuv}" "${libedit}" "${libffi.dev}" "${boost.dev}" "${boost.out}" "${zlib.dev}"]'
- export libraryPaths
- substituteAllInPlace ./pixie/ffi-infer.pxi)
- '';
- buildPhase = ''(
- PYTHONPATH="`pwd`/pypy-src:$PYTHONPATH";
- RPYTHON="`pwd`/pypy-src/rpython/bin/rpython";
- cd pixie-src
- $PYTHON $RPYTHON ${common-flags} ${target}
- find pixie -name "*.pxi" -exec ./pixie-vm -c {} \;
- )'';
- LD_LIBRARY_PATH = library-path;
- C_INCLUDE_PATH = include-path;
- LIBRARY_PATH = library-path;
- PATH = bin-path;
- installPhase = ''
- mkdir -p $out/share $out/bin
- cp pixie-src/pixie-vm $out/share/pixie-vm
- cp -R pixie-src/pixie $out/share/pixie
- makeWrapper $out/share/pixie-vm $out/bin/pixie \
- --prefix LD_LIBRARY_PATH : ${LD_LIBRARY_PATH} \
- --prefix C_INCLUDE_PATH : ${C_INCLUDE_PATH} \
- --prefix LIBRARY_PATH : ${LIBRARY_PATH} \
- --prefix PATH : ${PATH}
- '';
- doCheck = true;
- checkPhase = ''
- RES=$(./pixie-src/pixie-vm -e "(print :ok)")
- if [ "$RES" != ":ok" ]; then
- echo "ERROR Unexpected output: '$RES'"
- return 1
- else
- echo "$RES"
- fi
- '';
- meta = {
- description = "A clojure-like lisp, built with the pypy vm toolkit";
- homepage = "https://github.com/pixie-lang/pixie";
- license = lib.licenses.lgpl3;
- platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
- maintainers = with lib.maintainers; [ bendlas ];
- };
- };
-in build (builtins.getAttr variant variants)
diff --git a/pkgs/development/interpreters/pixie/dust.nix b/pkgs/development/interpreters/pixie/dust.nix
deleted file mode 100644
index 9c39b5c5ce63..000000000000
--- a/pkgs/development/interpreters/pixie/dust.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ lib, stdenv, fetchFromGitHub
-, pixie, rlwrap
-}:
-
-stdenv.mkDerivation rec {
- pname = "dust";
- version = "0-91";
-
- src = fetchFromGitHub {
- owner = "pixie-lang";
- repo = "dust";
- rev = "efe469661e749a71e86858fd006f61464810575a";
- sha256 = "09n57b6haxwask9m8vimv42ikczf7lgfc7m9izjrcqgs0padvfzc";
- };
-
- buildInputs = [ pixie ];
-
- patches = [ ./make-paths-configurable.patch ];
-
- configurePhase = ''
- pixiePath="${pixie}/bin/pixie" \
- basePath="$out/share/dust" \
- rlwrapPath="${rlwrap}/bin/rlwrap" \
- substituteAll dust.in dust
- chmod +x dust
- '';
-
- # FIXME: AOT for dust
- # buildPhase = ''
- # find . -name "*.pxi" -exec pixie-vm -c {} \;
- # '';
-
- installPhase = ''
- mkdir -p $out/bin $out/share/dust
- cp -a src/ run.pxi $out/share/dust
- mv dust $out/bin/dust
- '';
-
- meta = with lib; {
- description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies";
- homepage = src.meta.homepage;
- maintainers = with maintainers; [ ];
- license = licenses.lgpl3;
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/development/interpreters/pixie/load_paths.patch b/pkgs/development/interpreters/pixie/load_paths.patch
deleted file mode 100644
index a36d280c5867..000000000000
--- a/pkgs/development/interpreters/pixie/load_paths.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/pixie/ffi-infer.pxi b/pixie/ffi-infer.pxi
-index 9f13ac7..74301c2 100644
---- a/pixie/ffi-infer.pxi
-+++ b/pixie/ffi-infer.pxi
-@@ -1,15 +1,12 @@
- (ns pixie.ffi-infer
- (:require [pixie.io-blocking :as io]))
-
-+(defn -add-library-path [p]
-+ (swap! load-paths conj (str p "/include"))
-+ (swap! load-paths conj (str p "/lib")))
-
--(defn -add-rel-path [rel]
-- (swap! load-paths conj (str (first @load-paths) "/" rel)))
--
--(-add-rel-path "lib")
--(-add-rel-path "include")
--(-add-rel-path "../lib")
--(-add-rel-path "../include")
--
-+(doseq [lp @libraryPaths@]
-+ (-add-library-path lp))
-
- (def *config* nil)
- (set-dynamic! (var *config*))
diff --git a/pkgs/development/interpreters/pixie/make-paths-configurable.patch b/pkgs/development/interpreters/pixie/make-paths-configurable.patch
deleted file mode 100644
index e22e83d2ee74..000000000000
--- a/pkgs/development/interpreters/pixie/make-paths-configurable.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 0cbb82e606610d36e52c70d888995fbbf9b0d7c8 Mon Sep 17 00:00:00 2001
-From: Herwig Hochleitner
-Date: Sun, 28 Feb 2016 16:34:14 +0100
-Subject: [PATCH] make paths configurable
-
----
- dust | 52 ----------------------------------------------------
- dust.in | 43 +++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 43 insertions(+), 52 deletions(-)
- delete mode 100755 dust
- create mode 100755 dust.in
-
-diff --git a/dust b/dust
-deleted file mode 100755
-index ffced9b..0000000
---- a/dust
-+++ /dev/null
-@@ -1,52 +0,0 @@
--#!/usr/bin/env bash
--
--base_path=$0
--if [ -L "$base_path" ]; then
-- base_path=`readlink $base_path`
--fi
--base_path=`dirname $base_path`
--
--pixie_path=`which pixie-vm`
--if [ -z "$pixie_path" ]; then
-- echo "Error: 'pixie-vm' must be on your PATH"
-- exit 1
--fi
--
--function set_load_path() {
-- load_path=""
-- if ([ -f "project.edn" ] || [ -f "project.pxi" ]) && [ -f ".load-path" ]; then
-- load_path="`cat .load-path`"
-- fi
--}
--
--if [ ! -f "project.edn" ] && [ -f "project.pxi" ]; then
-- echo "Warning: 'project.pxi' is deprecated, please use 'project.edn'."
-- echo "To start you can run the following command:"
-- echo " pixie-vm -l $base_path/src -e '(require dust.project :as p) (p/load-project!) (prn (dissoc @p/*project* :path))'"
-- echo
--fi
--
--set_load_path
--run_dust="$pixie_path -l $base_path/src $load_path $base_path/run.pxi"
--
--case $1 in
-- ""|"repl")
-- rlwrap_cmd=""
-- if [ -n "`which rlwrap`" ]; then
-- rlwrap_cmd="rlwrap -aignored -n"
-- fi
-- $rlwrap_cmd $pixie_path $load_path
-- ;;
-- "run")
-- shift
-- file=$1
-- shift
-- $pixie_path $load_path $file $@
-- ;;
-- -h|--help)
-- $run_dust help
-- ;;
-- *)
-- $run_dust $@
-- ;;
--esac
-diff --git a/dust.in b/dust.in
-new file mode 100755
-index 0000000..44a7fbd
---- /dev/null
-+++ b/dust.in
-@@ -0,0 +1,40 @@
-+#!/usr/bin/env bash
-+
-+base_path=@basePath@
-+pixie_path=@pixiePath@
-+rlwrap_cmd=@rlwrapPath@
-+
-+function set_load_path() {
-+ load_path=""
-+ if ([ -f "project.edn" ] || [ -f "project.pxi" ]) && [ -f ".load-path" ]; then
-+ load_path="`cat .load-path`"
-+ fi
-+}
-+
-+if [ ! -f "project.edn" ] && [ -f "project.pxi" ]; then
-+ echo "Warning: 'project.pxi' is deprecated, please use 'project.edn'."
-+ echo "To start you can run the following command:"
-+ echo " pixie-vm -l $base_path/src -e '(require dust.project :as p) (p/load-project!) (prn (dissoc @p/*project* :path))'"
-+ echo
-+fi
-+
-+set_load_path
-+run_dust="$pixie_path -l $base_path/src $load_path $base_path/run.pxi"
-+
-+case $1 in
-+ ""|"repl")
-+ $rlwrap_cmd -aignored -n $pixie_path $load_path
-+ ;;
-+ "run")
-+ shift
-+ file=$1
-+ shift
-+ $pixie_path $load_path $file $@
-+ ;;
-+ -h|--help)
-+ $run_dust help
-+ ;;
-+ *)
-+ $run_dust $@
-+ ;;
-+esac
---
-2.7.1
-
diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/development/libraries/docopt_cpp/default.nix
index 3de84b684e52..4fae1db9ba3c 100644
--- a/pkgs/development/libraries/docopt_cpp/default.nix
+++ b/pkgs/development/libraries/docopt_cpp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, python2 }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, python3 }:
stdenv.mkDerivation rec {
version = "0.6.3";
@@ -11,7 +11,15 @@ stdenv.mkDerivation rec {
sha256 = "0cz3vv7g5snfbsqcf3q8bmd6kv5qp84gj3avwkn4vl00krw13bl7";
};
- nativeBuildInputs = [ cmake python2 ];
+ patches = [
+ (fetchpatch {
+ name = "python3-for-tests";
+ url = "https://github.com/docopt/docopt.cpp/commit/b3d909dc952ab102a4ad5a1541a41736f35b92ba.patch";
+ hash = "sha256-JJR09pbn3QhYaZAIAjs+pe28+g1VfgHUKspWorHzr8o=";
+ })
+ ];
+
+ nativeBuildInputs = [ cmake python3 ];
cmakeFlags = ["-DWITH_TESTS=ON"];
diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix
index 1f2966695d86..f59198a5528e 100644
--- a/pkgs/development/libraries/goocanvas/2.x.nix
+++ b/pkgs/development/libraries/goocanvas/2.x.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib, gnome }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python3, gtk3, cairo, glib, gnome }:
stdenv.mkDerivation rec {
pname = "goocanvas";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67";
};
- nativeBuildInputs = [ pkg-config gettext gtk-doc python2 ];
+ nativeBuildInputs = [ pkg-config gettext gtk-doc python3 ];
buildInputs = [ gtk3 cairo glib gobject-introspection ];
configureFlags = [
diff --git a/pkgs/development/libraries/libinjection/default.nix b/pkgs/development/libraries/libinjection/default.nix
index 81a1398147ba..d4193f32ccc0 100644
--- a/pkgs/development/libraries/libinjection/default.nix
+++ b/pkgs/development/libraries/libinjection/default.nix
@@ -1,5 +1,5 @@
-{ lib, stdenv, fetchFromGitHub
-, python2
+{ lib, stdenv, fetchFromGitHub, fetchpatch
+, python3
}:
stdenv.mkDerivation rec {
@@ -13,11 +13,19 @@ stdenv.mkDerivation rec {
sha256 = "0chsgam5dqr9vjfhdcp8cgk7la6nf3lq44zs6z6si98cq743550g";
};
- nativeBuildInputs = [ python2 ];
+ nativeBuildInputs = [ python3 ];
strictDeps = true;
- patchPhase = ''
+ patches = [
+ (fetchpatch {
+ name = "support-python3-for-building";
+ url = "https://raw.githubusercontent.com/sysown/proxysql/bed58f92917eb651b80fd8ffa627a485eb320805/deps/libinjection/update-build-py3.diff";
+ hash = "sha256-SPdf57FIDDNpatWe5pjhAiZl5yPMDEv50k0Wj+eWTEM=";
+ })
+ ];
+
+ postPatch = ''
patchShebangs src
substituteInPlace src/Makefile \
--replace /usr/local $out
diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix
index 475ebc7517e5..38b106d474b7 100644
--- a/pkgs/development/libraries/zimg/default.nix
+++ b/pkgs/development/libraries/zimg/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zimg";
- version = "3.0.4";
+ version = "3.0.3";
src = fetchFromGitHub {
owner = "sekrit-twc";
repo = "zimg";
rev = "release-${version}";
- sha256 = "1069x49l7kh1mqcq1h3f0m5j0h832jp5x230bh4c613ymgg5kn00";
+ sha256 = "0pwgf1mybpa3fs13p6jryzm32vfldyql9biwaypqdcimlnlmyk20";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix
new file mode 100644
index 000000000000..49379dfd5413
--- /dev/null
+++ b/pkgs/development/php-packages/openswoole/default.nix
@@ -0,0 +1,22 @@
+{ lib, stdenv, buildPecl, php, valgrind, pcre2 }:
+let
+ pname = "openswoole";
+ version = "4.11.1";
+in
+buildPecl {
+ inherit pname version;
+
+ sha256 = "sha256-Rhoa4ny86dwB3e86/1W30AlDGRUDYjK8RusquKF5Izg=";
+
+ buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ];
+ internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ];
+
+ meta = with lib; {
+ changelog = "https://pecl.php.net/package/openswoole/${version}";
+ description = "Coroutine-based concurrency library and high performance programmatic server for PHP";
+ homepage = "https://www.openswoole.com/";
+ license = licenses.asl20;
+ longDescription = "Open Swoole allows you to build high-performance, async multi-tasking webservices and applications using an easy to use Coroutine API.\nOpen Swoole is a complete async solution that has built-in support for async programming via coroutines.\nIt offers a range of multi-threaded I/O modules (HTTP Server, WebSockets, TaskWorkers, Process Pools) out of the box and support for popular PHP clients like PDO for MySQL, and CURL.\nYou can use the sync or async, Coroutine API to write whole applications or create thousands of light weight Coroutines within one Linux process.";
+ maintainers = teams.php.members;
+ };
+}
diff --git a/pkgs/development/php-packages/pdepend/default.nix b/pkgs/development/php-packages/pdepend/default.nix
new file mode 100644
index 000000000000..d1507040fcec
--- /dev/null
+++ b/pkgs/development/php-packages/pdepend/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, makeWrapper, lib, php }:
+
+let
+ pname = "pdepend";
+ version = "2.10.3";
+in
+stdenv.mkDerivation {
+ inherit pname version;
+
+ src = fetchurl {
+ url = "https://github.com/pdepend/pdepend/releases/download/${version}/pdepend.phar";
+ sha256 = "I5+n8+a3rHRgW4OM6FbVcf3T1wu9zBrTSb5sGq7ArH4=";
+ };
+
+ dontUnpack = true;
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin
+ install -D $src $out/libexec/pdepend/pdepend.phar
+ makeWrapper ${php}/bin/php $out/bin/pdepend \
+ --add-flags "$out/libexec/pdepend/pdepend.phar"
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "An adaptation of JDepend for PHP";
+ homepage = "https://github.com/pdepend/pdepend";
+ license = licenses.bsd3;
+ longDescription = "
+ PHP Depend is an adaptation of the established Java
+ development tool JDepend. This tool shows you the quality
+ of your design in terms of extensibility, reusability and
+ maintainability.
+ ";
+ maintainers = teams.php.members;
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix
index 6d3c7fffe6ad..fce105163a54 100644
--- a/pkgs/development/python-modules/bleach/default.nix
+++ b/pkgs/development/python-modules/bleach/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "bleach";
- version = "4.1.0";
+ version = "5.0.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-CQDYs366YagC7kCsAGH4wrXe4pwZJ90dIz4HXr9acdo=";
+ hash = "sha256-xtbMBUvcnIO0i4CD4jbl8A8jhChmbSzi4IPqpf1WhWU=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix
index 3c24d5f31924..64774a70867a 100644
--- a/pkgs/development/python-modules/breezy/default.nix
+++ b/pkgs/development/python-modules/breezy/default.nix
@@ -3,23 +3,36 @@
, fetchPypi
, configobj
, patiencediff
-, six
+, fastbencode
, fastimport
, dulwich
, launchpadlib
, testtools
+, pythonOlder
+, installShellFiles
}:
buildPythonPackage rec {
pname = "breezy";
- version = "3.2.1";
+ version = "3.2.2";
+
+ disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-4LJo6xoooq8EUoDDfQIa4y1/8XX0ybmfM6rX2wsp2Fw=";
+ sha256 = "sha256-GHpuRSCN0F2BdQc2cgyDcQz0gJT1R+xAgcVxJZVZpNU=";
};
- propagatedBuildInputs = [ configobj patiencediff six fastimport dulwich launchpadlib ];
+ nativeBuildInputs = [ installShellFiles ];
+
+ propagatedBuildInputs = [
+ configobj
+ fastbencode
+ patiencediff
+ fastimport
+ dulwich
+ launchpadlib
+ ];
checkInputs = [ testtools ];
@@ -29,6 +42,8 @@ buildPythonPackage rec {
# symlink for bazaar compatibility
postInstall = ''
ln -s "$out/bin/brz" "$out/bin/bzr"
+
+ installShellCompletion --cmd brz --bash contrib/bash/brz
'';
pythonImportsCheck = [ "breezy" ];
@@ -36,7 +51,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Friendly distributed version control system";
homepage = "https://www.breezy-vcs.org/";
- license = licenses.gpl2;
+ license = licenses.gpl2Only;
maintainers = [ maintainers.marsam ];
};
}
diff --git a/pkgs/development/python-modules/dungeon-eos/default.nix b/pkgs/development/python-modules/dungeon-eos/default.nix
index 0b1e5ebc53f5..f87bbf82b77b 100644
--- a/pkgs/development/python-modules/dungeon-eos/default.nix
+++ b/pkgs/development/python-modules/dungeon-eos/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "dungeon-eos";
- version = "0.0.4";
+ version = "0.0.5";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
rev = version;
- sha256 = "0hxygjk9i4qlwsxnxr52cxhqy3i62pc373z1x5sh2pas5ag59bvl";
+ sha256 = "sha256-Z1fGtslXP8zcZmVeWjRrbcM2ZJsfbrWjpLWZ49uSCRY=";
};
doCheck = false; # there are no tests
diff --git a/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix
new file mode 100644
index 000000000000..87072491cef4
--- /dev/null
+++ b/pkgs/development/python-modules/fastbencode/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchPypi, python, cython }:
+
+buildPythonPackage rec {
+ pname = "fastbencode";
+ version = "0.0.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-tryavlQtBmN5NSlXb0m6iJFQhVT4XQm11tXtevfgxuQ=";
+ };
+
+ nativeBuildInputs = [ cython ];
+
+ pythonImportsCheck = [ "fastbencode" ];
+
+ checkPhase = ''
+ ${python.interpreter} -m unittest fastbencode.tests.test_suite
+ '';
+
+ meta = with lib; {
+ description = "Fast implementation of bencode";
+ homepage = "https://github.com/breezy-team/fastbencode";
+ license = licenses.gpl2Only;
+ maintainers = [ maintainers.marsam ];
+ };
+}
diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix
new file mode 100644
index 000000000000..a075d64406ee
--- /dev/null
+++ b/pkgs/development/python-modules/fontmake/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, glyphslib
+, setuptools-scm
+, ufo2ft
+, fonttools
+, fontmath
+, lxml
+, setuptools
+}:
+
+buildPythonPackage rec {
+ pname = "fontmake";
+ version = "3.3.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-lD7MvZdr9CeWdoZtD3+8stVJTeQN5/AQ4miA/I2TFoE=";
+ extension = "zip";
+ };
+
+ nativeBuildInputs = [ setuptools-scm ];
+
+ propagatedBuildInputs = [
+ glyphslib
+ ufo2ft
+ fonttools
+ fontmath
+ lxml
+ setuptools
+ ];
+
+ pythonImportsCheck = [ "fontmake" ];
+
+ meta = {
+ description = "Compiles fonts from various sources (.glyphs, .ufo, designspace) into binaries formats (.otf, .ttf)";
+ homepage = "https://github.com/googlefonts/fontmake";
+ license = lib.licenses.asl20;
+ maintainers = [ lib.maintainers.BarinovMaxim ];
+ };
+}
diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index a70dfef00541..a667f631eb18 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -13,11 +13,12 @@
, sphinx
, pytestCheckHook
, glibcLocales
+, setuptools-scm
}:
buildPythonPackage rec {
pname = "fonttools";
- version = "4.30.0";
+ version = "4.33.3";
disabled = pythonOlder "3.7";
@@ -25,9 +26,11 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = version;
- sha256 = "1y9f071bdl66rsx42j16j5v53h85xra5qlg860rz3m054s2rmin9";
+ sha256 = "MUIZGnYwlfTat9655AOYgK5r6AvHj/xXghUvOZR8HIM=";
};
+ nativeBuildInputs = [ setuptools-scm ];
+
# all dependencies are optional, but
# we run the checks with them
@@ -51,6 +54,8 @@ buildPythonPackage rec {
unicodedata2
];
+ pythonImportsCheck = [ "fontTools" ];
+
preCheck = ''
# tests want to execute the "fonttools" executable from $PATH
export PATH="$out/bin:$PATH"
@@ -72,7 +77,6 @@ buildPythonPackage rec {
"Tests/ufoLib"
];
-
meta = with lib; {
homepage = "https://github.com/fonttools/fonttools";
description = "A library to manipulate font files from Python";
diff --git a/pkgs/development/python-modules/gbulb/default.nix b/pkgs/development/python-modules/gbulb/default.nix
new file mode 100644
index 000000000000..fe0c1b21d288
--- /dev/null
+++ b/pkgs/development/python-modules/gbulb/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pygobject3
+, pytestCheckHook
+, gtk3
+, gobject-introspection
+}:
+
+buildPythonPackage rec {
+ pname = "gbulb";
+ version = "0.6.3";
+
+ src = fetchFromGitHub {
+ owner = "beeware";
+ repo = "gbulb";
+ rev = "v${version}";
+ sha256 = "sha256-QNpZf1zfe6r6MtmYMWSrXPsXm5iX36oMx4GnXiTYPaQ=";
+ };
+
+ propagatedBuildInputs = [
+ pygobject3
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ gtk3
+ gobject-introspection
+ ];
+
+ disabledTests = [
+ "test_glib_events.TestBaseGLibEventLoop" # Somtimes fail due to imprecise timing
+ ];
+
+ pythonImportsCheck = [ "gbulb" ];
+
+ meta = with lib; {
+ description = "GLib implementation of PEP 3156";
+ homepage = "https://github.com/beeware/gbulb";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ marius851000 ];
+ };
+}
diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix
new file mode 100644
index 000000000000..2d6b19bea35d
--- /dev/null
+++ b/pkgs/development/python-modules/glyphslib/default.nix
@@ -0,0 +1,59 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, fonttools
+, openstep-plist
+, ufoLib2
+, pytestCheckHook
+, unicodedata2
+, setuptools-scm
+, ufonormalizer
+, xmldiff
+, defcon
+, ufo2ft
+, skia-pathops
+}:
+
+buildPythonPackage rec {
+ pname = "glyphslib";
+ version = "6.0.4";
+
+ format = "pyproject";
+
+ src = fetchPypi {
+ pname = "glyphsLib";
+ inherit version;
+ sha256 = "sha256-PT66n1WEO5FNcwov8GaXT1YNrAi22X4HN7iVNkuehKI=";
+ };
+
+ nativeBuildInputs = [ setuptools-scm ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "glyphsLib" ];
+
+ propagatedBuildInputs = [
+ fonttools
+ openstep-plist
+ ufoLib2
+ unicodedata2
+ ufonormalizer
+ xmldiff
+ defcon
+ ufo2ft
+ skia-pathops
+ ];
+
+ disabledTestPaths = [
+ "tests/builder/designspace_gen_test.py" # this test tries to use non-existent font "CoolFoundry Examplary Serif"
+ "tests/builder/interpolation_test.py" # this test tries to use a font that previous test should made
+ ];
+
+ meta = {
+ description = "Bridge from Glyphs source files (.glyphs) to UFOs and Designspace files via defcon and designspaceLib";
+ homepage = "https://github.com/googlefonts/glyphsLib";
+ license = lib.licenses.asl20;
+ maintainers = [ lib.maintainers.BarinovMaxim ];
+ };
+}
+
diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix
index 1b2071e7f0c5..9c96f71c2813 100644
--- a/pkgs/development/python-modules/nbclient/default.nix
+++ b/pkgs/development/python-modules/nbclient/default.nix
@@ -1,20 +1,21 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder,
async_generator, traitlets, nbformat, nest-asyncio, jupyter-client,
pytest, xmltodict, nbconvert, ipywidgets
-, doCheck ? true
}:
buildPythonPackage rec {
pname = "nbclient";
- version = "0.5.13";
+ version = "0.6.2";
+ format = "setuptools";
+
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-QMUsm148MfrsruafICs/U+ONfBxWPeD63enX7aD9r+g=";
+ hash = "sha256-i0dVPxztB3zXxFN/1dcB1G92gfJLKCdeXMHTR+fJtGs=";
};
- inherit doCheck;
+ doCheck = false; # Avoid infinite recursion
checkInputs = [ pytest xmltodict nbconvert ipywidgets ];
propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ];
diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix
index 5a89210170fe..69aa660f1425 100644
--- a/pkgs/development/python-modules/nbconvert/default.nix
+++ b/pkgs/development/python-modules/nbconvert/default.nix
@@ -5,13 +5,11 @@
, glibcLocales
, entrypoints
, bleach
-, beautifulsoup4
, mistune
, nbclient
, jinja2
, pygments
, traitlets
-, testpath
, jupyter_core
, jupyterlab-pygments
, nbformat
@@ -20,15 +18,18 @@
, tornado
, jupyter-client
, defusedxml
+, tinycss2
+, beautifulsoup4
}:
buildPythonPackage rec {
pname = "nbconvert";
- version = "6.4.5";
+ version = "6.5.0";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-IRY6jiBzwHEJyo85iDbkXv26KqzqaNb3WopUX+8HDU4=";
+ hash = "sha256-Ij5G4nq+hZa4rtVDAfrbukM7f/6oGWpo/Xsf9Qnu6Z0=";
};
# Add $out/share/jupyter to the list of paths that are used to search for
@@ -44,10 +45,10 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook glibcLocales ];
propagatedBuildInputs = [
- entrypoints bleach mistune jinja2 pygments traitlets testpath
+ entrypoints bleach mistune jinja2 pygments traitlets
jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client
- defusedxml beautifulsoup4
- (nbclient.override { doCheck = false; }) # avoid infinite recursion
+ defusedxml tinycss2 beautifulsoup4
+ nbclient
jupyterlab-pygments
];
diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix
index d4d9cf1811e0..bc650b7eafe1 100644
--- a/pkgs/development/python-modules/nvchecker/default.nix
+++ b/pkgs/development/python-modules/nvchecker/default.nix
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "nvchecker";
- version = "2.7";
+ version = "2.8";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "lilydjwg";
repo = pname;
rev = "v${version}";
- hash = "sha256-OPUqkHLG8PUlD5NP7q/BpKUvmAA8Jk1NvsPPVbImv0A=";
+ hash = "sha256-ikpjR1fEZBsSOE20jxTyarb9Pqn3Fz+TYOzXp0g4G9c=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/openstep-plist/default.nix b/pkgs/development/python-modules/openstep-plist/default.nix
new file mode 100644
index 000000000000..274294f59388
--- /dev/null
+++ b/pkgs/development/python-modules/openstep-plist/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools-scm
+, pytestCheckHook
+, cython
+, pythonImportsCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "openstep-plist";
+ version = "0.3.0";
+
+ src = fetchPypi {
+ pname = "openstep_plist";
+ inherit version;
+ sha256 = "sha256-KO4sGKjod5BwUFQ1MU2S1dG0DyiJ06mdroMbRDsugBk=";
+ extension = "zip";
+ };
+
+ nativeBuildInputs = [ setuptools-scm cython ];
+ checkInputs = [ pytestCheckHook ];
+ pythonImportsCheck = [ "openstep_plist" ];
+
+ meta = {
+ description = "Parser for the 'old style' OpenStep property list format also known as ASCII plist";
+ homepage = "https://github.com/fonttools/openstep-plist";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.BarinovMaxim ];
+ };
+}
diff --git a/pkgs/development/python-modules/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix
index e9cff7eb8243..0c700151f694 100644
--- a/pkgs/development/python-modules/py-desmume/default.nix
+++ b/pkgs/development/python-modules/py-desmume/default.nix
@@ -3,29 +3,18 @@
, alsa-lib, soundtouch, openal
}:
-let
- desmume = fetchFromGitHub {
- owner = "SkyTemple";
- repo = "desmume";
- rev = "8e7af8ada883b7e91344985236f7c7c04ee795d7";
- sha256 = "0svmv2rch9q347gbpbws4agymas8n014gh1ssaf91wx7jwn53842";
- };
-in
buildPythonPackage rec {
pname = "py-desmume";
- version = "0.0.3.post2";
+ version = "0.0.4.post2";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
rev = version;
- sha256 = "1chsg70k8kqnlasn88b04ww3yl0lay1bjxvz6lhp6s2cvsxv03x1";
+ sha256 = "sha256-a819+K/Ovnz53ViDKpUGGjeblWvrAO5ozt/tizdLKCY=";
+ fetchSubmodules = true;
};
- postPatch = ''
- cp -R --no-preserve=mode ${desmume} __build_desmume
- '';
-
buildInputs = [ GitPython libpcap SDL2 alsa-lib soundtouch openal ];
nativeBuildInputs = [ meson ninja pkg-config ];
propagatedBuildInputs = [ pillow pygobject3 ];
diff --git a/pkgs/development/python-modules/pyeapi/default.nix b/pkgs/development/python-modules/pyeapi/default.nix
index a31123492d42..aa9e0983b7e3 100644
--- a/pkgs/development/python-modules/pyeapi/default.nix
+++ b/pkgs/development/python-modules/pyeapi/default.nix
@@ -1,10 +1,11 @@
{ lib
, buildPythonPackage
-, pythonAtLeast
, fetchFromGitHub
+, fetchpatch
+, mock
, netaddr
, pytestCheckHook
-, mock
+, pythonOlder
}:
buildPythonPackage rec {
@@ -12,8 +13,7 @@ buildPythonPackage rec {
version = "0.8.4";
format = "pyproject";
- # https://github.com/arista-eosplus/pyeapi/issues/189
- disabled = pythonAtLeast "3.10";
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "arista-eosplus";
@@ -22,21 +22,49 @@ buildPythonPackage rec {
sha256 = "13chya6wix5jb82k67gr44bjx35gcdwz80nsvpv0gvzs6shn4d7b";
};
- propagatedBuildInputs = [ netaddr ];
+ propagatedBuildInputs = [
+ netaddr
+ ];
checkInputs = [
mock
pytestCheckHook
];
- pytestFlagsArray = [ "test/unit" ];
+ patches = [
+ # Fix usage of collection, https://github.com/arista-eosplus/pyeapi/pull/223
+ (fetchpatch {
+ name = "fix-collection-usage.patch";
+ url = "https://github.com/arista-eosplus/pyeapi/commit/81754f57eb095703cc474f527a0915360af76f68.patch";
+ sha256 = "sha256-ZNBTPRNmXCFVJeRAJxzIHmCOXZiGwU6t4ekSupU3BX8=";
+ })
+ (fetchpatch {
+ name = "fix-collection-usage-2.patch";
+ url = "https://github.com/arista-eosplus/pyeapi/commit/cc9c584e4a3167e3c1624cccb6bc0d9c9bcdbc1c.patch";
+ sha256 = "sha256-EY0i1Skm1llEQAAzvrb2yelhhLBkqKAFJB5ObAIxAYo=";
+ excludes = [
+ ".github/workflows/ci.yml"
+ ];
+ })
+ (fetchpatch {
+ name = "fix-collection-usage-3.patch";
+ url = "https://github.com/arista-eosplus/pyeapi/commit/dc35ab076687ea71665ae9524480b05a4e893909.patch";
+ sha256 = "sha256-xPaYULCPTxiQGB9Im/qLet+XebW9wq+TAfrxcgQxcoE=";
+ })
+ ];
- pythonImportsCheck = [ "pyeapi" ];
+ pytestFlagsArray = [
+ "test/unit"
+ ];
+
+ pythonImportsCheck = [
+ "pyeapi"
+ ];
meta = with lib; {
description = "Client for Arista eAPI";
homepage = "https://github.com/arista-eosplus/pyeapi";
license = licenses.bsd3;
- maintainers = [ maintainers.astro ];
+ maintainers = with maintainers; [ astro ];
};
}
diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix
index 130486a55f17..d85a17332240 100644
--- a/pkgs/development/python-modules/pyinfra/default.nix
+++ b/pkgs/development/python-modules/pyinfra/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "pyinfra";
- version = "2.0.1";
+ version = "2.0.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-157NtpA85FS27Ln1Xsvq5/qumSsr0WSDOhG0UwMUnRE=";
+ sha256 = "sha256-AW2pOyLqyugTSM7PE4oR9ZwD1liNpdD636QA3ElafG0=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/skia-pathops/default.nix b/pkgs/development/python-modules/skia-pathops/default.nix
new file mode 100644
index 000000000000..53d1fb1227d7
--- /dev/null
+++ b/pkgs/development/python-modules/skia-pathops/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, cython
+, ninja
+, setuptools-scm
+, setuptools
+, fetchPypi
+, gn
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "skia-pathops";
+ version = "0.7.2";
+
+ src = fetchPypi {
+ pname = "skia-pathops";
+ inherit version;
+ extension = "zip";
+ sha256 = "sha256-Gdhcmv77oVr5KxPIiJlk935jgvWPQsYEC0AZ6yjLppA=";
+ };
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "build_cmd = [sys.executable, build_skia_py, build_dir]" \
+ 'build_cmd = [sys.executable, build_skia_py, "--no-fetch-gn", "--no-virtualenv", "--gn-path", "${gn}/bin/gn", build_dir]'
+ '';
+
+ nativeBuildInputs = [ cython ninja setuptools-scm ];
+
+ propagatedBuildInputs = [ setuptools ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "pathops" ];
+
+ meta = {
+ description = "Python access to operations on paths using the Skia library";
+ homepage = "https://skia.org/dev/present/pathops";
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.BarinovMaxim ];
+ };
+}
diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix
index 7893cfb2e818..42012dbd4cf5 100644
--- a/pkgs/development/python-modules/skytemple-files/default.nix
+++ b/pkgs/development/python-modules/skytemple-files/default.nix
@@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "skytemple-files";
- version = "1.3.3";
+ version = "1.3.9";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
rev = version;
- sha256 = "01j6khn60mdmz32xkpqrzwdqibmpdpi2wvwzxgdnaim9sq0fdqws";
+ sha256 = "sha256-Z/jbr9o0WKPjkAsfZzxuwAKKdwYV3rLGkUMlMgyC5s0=";
fetchSubmodules = true;
};
diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix
index 793e22690e4a..f14bf9330c48 100644
--- a/pkgs/development/python-modules/skytemple-rust/default.nix
+++ b/pkgs/development/python-modules/skytemple-rust/default.nix
@@ -2,24 +2,26 @@
buildPythonPackage rec {
pname = "skytemple-rust";
- version = "unstable-2021-08-11";
+ version = "1.3.7";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
- rev = "e306e5edc096cb3fef25585d9ca5a2817543f1cd";
- sha256 = "0ja231gsy9i1z6jsaywawz93rnyjhldngi5i787nhnf88zrwx9ml";
+ rev = version;
+ sha256 = "sha256-rC7KA79va8gZpMKJQ7s3xYdbopNqmWdRYDCbaWaxsR0=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- sha256 = "0gjvfblyv72m0nqv90m7qvbdnazsh5ind1pxwqz83vm4zjh9a873";
+ sha256 = "sha256-lXPCxRbaqUC5EfyeBPtJDuGADYOA+DWMaOZRwXppP8E=";
};
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]);
+ GETTEXT_SYSTEM = true;
+
doCheck = false; # there are no tests
pythonImportsCheck = [ "skytemple_rust" ];
diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix
index bb91bad3ff1d..8ca4a45b3710 100644
--- a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix
+++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix
@@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "skytemple-ssb-debugger";
- version = "1.3.0";
+ version = "1.3.8.post2";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
rev = version;
- sha256 = "12v0071125m8xjcp2hxm9qvs0qw4hdhkx8r3gbl0plm22vl3fk0d";
+ sha256 = "sha256-dd0qsSNBwxuSopjz2PLqEFddZpvMgeJIjBXY5P6OAow=";
};
buildInputs = [ gobject-introspection gtk3 gtksourceview3 ];
diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix
index e4b5d9ee6775..743a7e77afda 100644
--- a/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -24,12 +24,12 @@
buildPythonPackage rec {
pname = "snowflake-connector-python";
- version = "2.7.6";
+ version = "2.7.7";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-MxYo4MoCdkSSuDteR3A72FcRWuKTRrct4y1/t8nsVIs=";
+ sha256 = "sha256-OZL/ClHY8yatR0AJVyomBq7AjBwQwm5f9UnmdlL8IFw=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix
index 8f700107bceb..b1e5ea7905a0 100644
--- a/pkgs/development/python-modules/ufo2ft/default.nix
+++ b/pkgs/development/python-modules/ufo2ft/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "ufo2ft";
- version = "2.26.0";
+ version = "2.27.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-1WQAs1ypWtLObgBzPtqtvHjkKnDWohu3PbI3bF7B0Sg=";
+ sha256 = "r5bE4M/blt5TKzP43MpijwYY6ll3aasszmGksY5WTTE=";
};
patches = [
diff --git a/pkgs/development/python-modules/ufoLib2/default.nix b/pkgs/development/python-modules/ufoLib2/default.nix
index 21894203d1ad..fab42e5169b8 100644
--- a/pkgs/development/python-modules/ufoLib2/default.nix
+++ b/pkgs/development/python-modules/ufoLib2/default.nix
@@ -5,6 +5,7 @@
, fonttools
, pytestCheckHook
, fs
+, setuptools-scm
}:
buildPythonPackage rec {
@@ -25,6 +26,8 @@ buildPythonPackage rec {
fs
];
+ nativeBuildInputs = [ setuptools-scm ];
+
checkInputs = [
pytestCheckHook
];
diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix
index f31708baef8b..ef1e1d1198f7 100644
--- a/pkgs/development/python-modules/wandb/default.nix
+++ b/pkgs/development/python-modules/wandb/default.nix
@@ -12,6 +12,7 @@
, jsonref
, jsonschema
, matplotlib
+, nbconvert
, nbformat
, pandas
, pathtools
@@ -36,7 +37,7 @@
buildPythonPackage rec {
pname = "wandb";
- version = "0.12.15";
+ version = "0.12.16";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -45,7 +46,7 @@ buildPythonPackage rec {
owner = pname;
repo = "client";
rev = "v${version}";
- hash = "sha256-Fq+JwUEZP1QDFKYVyiR8DUU0GQV6fK50FW78qaWh+Mo=";
+ hash = "sha256-ZY7nTj93piTEeHhW+H+nQ+ws2dDmmY6u3p7uz296PbA=";
};
# setuptools is necessary since pkg_resources is required at runtime.
@@ -66,23 +67,6 @@ buildPythonPackage rec {
shortuuid
];
- checkInputs = [
- azure-core
- bokeh
- flask
- jsonref
- jsonschema
- matplotlib
- nbformat
- pandas
- pydantic
- pytest-mock
- pytest-xdist
- pytestCheckHook
- scikit-learn
- tqdm
- ];
-
# wandb expects git to be in PATH. See https://gist.github.com/samuela/57aeee710e41ab2bf361b7ed8fbbeabf
# for the error message, and an example usage here: https://github.com/wandb/client/blob/d5f655b7ca7e3eac2f3a67a84bc5c2a664a31baf/wandb/sdk/internal/meta.py#L128.
# See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 as to
@@ -93,6 +77,30 @@ buildPythonPackage rec {
ln -s ${git}/bin/git $out/bin/git
'';
+ preCheck = ''
+ export HOME=$(mktemp -d)
+ '';
+
+ checkInputs = [
+ azure-core
+ bokeh
+ flask
+ jsonref
+ jsonschema
+ matplotlib
+ # Oddly enough, nbclient does not provide the `nbclient` module. Rather it's
+ # available in nbconvert. See https://github.com/NixOS/nixpkgs/issues/171493#issuecomment-1116960488.
+ nbconvert
+ nbformat
+ pandas
+ pydantic
+ pytest-mock
+ pytest-xdist
+ pytestCheckHook
+ scikit-learn
+ tqdm
+ ];
+
disabledTestPaths = [
# Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment.
"tests/test_cli.py"
diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix
index e791d02963fe..22bfbcae9181 100644
--- a/pkgs/development/tools/analysis/codeql/default.nix
+++ b/pkgs/development/tools/analysis/codeql/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
- version = "2.8.2";
+ version = "2.8.5";
dontConfigure = true;
dontBuild = true;
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
- sha256 = "sha256-F0tr4oQPgusLVCP5jSCYxl/xHbZLrVXd2FFYSJY3PPs=";
+ sha256 = "sha256-HZJBqm196RgWR/14mfrLYQlU+4W3t0b4TXme04XkfKw=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index 0649b0c86c6d..aa0e9adc2fc8 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -1,6 +1,5 @@
{ stdenv
, fetchurl
-, coursier
, autoPatchelfHook
, installShellFiles
, makeWrapper
@@ -11,58 +10,34 @@
stdenv.mkDerivation rec {
pname = "bloop";
- version = "1.4.13";
+ version = "1.5.0";
- bloop-coursier-channel = fetchurl {
- url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json";
- sha256 = "VbvBAz7mXhgQtbrlB6uCSmZXLcdYaROJRSREbazAReo=";
- };
+ platform =
+ if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux"
+ else if stdenv.isDarwin && stdenv.isx86_64 then "x86_64-apple-darwin"
+ else throw "unsupported platform";
bloop-bash = fetchurl {
url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bash-completions";
- sha256 = "2mt+zUEJvQ/5ixxFLZ3Z0m7uDSj/YE9sg/uNMjamvdE=";
+ sha256 = "sha256-2mt+zUEJvQ/5ixxFLZ3Z0m7uDSj/YE9sg/uNMjamvdE=";
};
bloop-fish = fetchurl {
url = "https://github.com/scalacenter/bloop/releases/download/v${version}/fish-completions";
- sha256 = "eFESR6iPHRDViGv+Fk3sCvPgVAhk2L1gCG4LnfXO/v4=";
+ sha256 = "sha256-eFESR6iPHRDViGv+Fk3sCvPgVAhk2L1gCG4LnfXO/v4=";
};
bloop-zsh = fetchurl {
url = "https://github.com/scalacenter/bloop/releases/download/v${version}/zsh-completions";
- sha256 = "WNMsPwBfd5EjeRbRtc06lCEVI2FVoLfrqL82OR0G7/c=";
+ sha256 = "sha256-WNMsPwBfd5EjeRbRtc06lCEVI2FVoLfrqL82OR0G7/c=";
};
- bloop-coursier = stdenv.mkDerivation rec {
- name = "${pname}-coursier-${version}";
-
- platform = if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux"
- else if stdenv.isDarwin && stdenv.isx86_64 then "x86_64-apple-darwin"
- else throw "unsupported platform";
-
- dontUnpack = true;
- installPhase = ''
- runHook preInstall
-
- export COURSIER_CACHE=$(pwd)
- export COURSIER_JVM_CACHE=$(pwd)
-
- mkdir channel
- ln -s ${bloop-coursier-channel} channel/bloop.json
- ${coursier}/bin/cs install --install-dir . --install-platform ${platform} --default-channels=false --channel channel --only-prebuilt=true bloop
-
- # Only keeping the binary, we'll wrap it ourselves
- # This guarantees the output of this fixed-output derivation doesn't have references to itself
- install -D -m 0755 .bloop.aux $out
-
- runHook postInstall
- '';
-
- outputHashMode = "recursive";
- outputHashAlgo = "sha256";
- outputHash = if stdenv.isLinux && stdenv.isx86_64 then "sha256-AiF/ih15Jd0WuDP/0vU0vdaSo3FGjWXos+hNVBayFz4="
- else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-LD23YpcNhWfioGDMqb1plqLy87ZHzT0zvIyc4O4WP5g="
- else throw "unsupported platform";
+ bloop-binary = fetchurl rec {
+ url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";
+ sha256 =
+ if stdenv.isLinux && stdenv.isx86_64 then "sha256-jif9z05W17vjFgb146qWC3o44HmbnX05gWPlbXttYsE="
+ else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-YOnXgKXsGrTu9P4I0NZW6ollZVQUXnbW8WtZTJmy+w0="
+ else throw "unsupported platform";
};
dontUnpack = true;
@@ -74,14 +49,9 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
- export COURSIER_CACHE=$(pwd)
- export COURSIER_JVM_CACHE=$(pwd)
+ install -D -m 0755 ${bloop-binary} $out/.bloop-wrapped
- install -D -m 0755 ${bloop-coursier} $out/.bloop-wrapped
-
- makeWrapper $out/.bloop-wrapped $out/bin/bloop \
- --set CS_NATIVE_LAUNCHER true \
- --set IS_CS_INSTALLED_LAUNCHER true
+ makeWrapper $out/.bloop-wrapped $out/bin/bloop
#Install completions
installShellCompletion --name bloop --bash ${bloop-bash}
diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix
index abeaf0d4cf18..40b230a72c31 100644
--- a/pkgs/development/tools/build-managers/scala-cli/default.nix
+++ b/pkgs/development/tools/build-managers/scala-cli/default.nix
@@ -1,15 +1,15 @@
{ stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }:
let
- version = "0.1.4";
+ version = "0.1.5";
assets = {
x86_64-darwin = {
asset = "scala-cli-x86_64-apple-darwin.gz";
- sha256 = "19bsfkp398rx3f9lnjzhp8pcs77n075v17rpm4hsmrpsz1hih5xy";
+ sha256 = "1sczbvvhh1ff8mdb6zj4q3fnrz1qsqmr58jlb1s3fy1wv2p5ywxl";
};
x86_64-linux = {
asset = "scala-cli-x86_64-pc-linux.gz";
- sha256 = "0rggf6v32rw3s82a1apz2b8nyiv8rd0lvw1bajl2s7jhlq8l7lc9";
+ sha256 = "1ahvjgcghh1pmgfsajg0b8bf5aaqxdx0f6b6qgljs0xfqm7zs05v";
};
};
in
diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix
index 581b0db3b35a..d6217671b0c1 100644
--- a/pkgs/development/tools/dive/default.nix
+++ b/pkgs/development/tools/dive/default.nix
@@ -13,8 +13,6 @@ buildGoModule rec {
vendorSha256 = "sha256-0gJ3dAPoilh3IWkuesy8geNsuI1T0DN64XvInc9LvlM=";
- doCheck = false;
-
nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ];
diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix
index ac653db1bf02..343ab9624ca6 100644
--- a/pkgs/development/tools/gosec/default.nix
+++ b/pkgs/development/tools/gosec/default.nix
@@ -20,8 +20,6 @@ buildGoModule rec {
"cmd/gosec"
];
- doCheck = false;
-
ldflags = [
"-s"
"-w"
diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix
index e5ad74d64c73..d9519130761d 100644
--- a/pkgs/development/tools/just/default.nix
+++ b/pkgs/development/tools/just/default.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "just";
- version = "1.1.2";
+ version = "1.1.3";
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = version;
- sha256 = "sha256-vUtJ9QVMmDGfkYTBoK8mVaJTEfNBQD5sTEp7kC0LNZw=";
+ sha256 = "sha256-2tKO0NyWFtRQgGrOKB3bROpDaIbQzTT4s2hGnBdZ6Fg=";
};
- cargoSha256 = "sha256-rJjLXktWnT6kRx1/18AFr6KciaFF8PaTpz27wz+vGug=";
+ cargoSha256 = "sha256-O5ntehb9ifWpBxBoOcFyyc8Ns6+SzHVOifUOD2QyhMY=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix
index 4dc63d54f145..4b8278f94ac7 100644
--- a/pkgs/development/tools/misc/clojure-lsp/default.nix
+++ b/pkgs/development/tools/misc/clojure-lsp/default.nix
@@ -2,18 +2,18 @@
buildGraalvmNativeImage rec {
pname = "clojure-lsp";
- version = "2022.04.18-00.59.32";
+ version = "2022.05.03-12.35.40";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "sha256-14EsJIKYl8TWbDqM9PyVrbs/4EssqXp0EK70RrFz+RE=";
+ sha256 = "sha256-5jh4umT93P53ufgdKYHNtiDJ1QpoJ8QpfAti0+tmvmc=";
};
jar = fetchurl {
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";
- sha256 = "d78094b015bd9e671eea2eb89ca0bb3ec58d39802ad1bfdf875b50e1cdd4995e";
+ sha256 = "b4984b5d8411542ec7d4732c950340d16e379ad76c40e57c3d41a8e7adda2faf";
};
extraNativeImageBuildArgs = [
diff --git a/pkgs/development/tools/protoc-gen-entgrpc/default.nix b/pkgs/development/tools/protoc-gen-entgrpc/default.nix
new file mode 100644
index 000000000000..d92b805082a2
--- /dev/null
+++ b/pkgs/development/tools/protoc-gen-entgrpc/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "protoc-gen-entgrpc";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "ent";
+ repo = "contrib";
+ rev = "v${version}";
+ sha256 = "sha256-cpk8yRDBsupI277NWYFaLCvi3ltQDLgCrcpJ/FUVi9o=";
+ };
+
+ vendorSha256 = "sha256-RwwGFBiasxMmtKMLSyAqvkozqoyzzYuslMq+HnzZUhw=";
+
+ subPackages = [ "entproto/cmd/protoc-gen-entgrpc" ];
+
+ ldflags = [ "-s" "-w" ];
+
+ meta = with lib; {
+ description = "Generator of an implementation of the service interface for ent protobuff";
+ downloadPage = "https://github.com/ent/contrib/";
+ license = licenses.asl20;
+ homepage = "https://entgo.io/";
+ maintainers = with maintainers; [ superherointj ];
+ };
+}
+
diff --git a/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/pkgs/development/tools/rust/cargo-sync-readme/default.nix
index 07c51c3163cb..904404c65c30 100644
--- a/pkgs/development/tools/rust/cargo-sync-readme/default.nix
+++ b/pkgs/development/tools/rust/cargo-sync-readme/default.nix
@@ -2,20 +2,21 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-sync-readme";
- version = "1.0";
+ version = "1.1";
src = fetchFromGitHub {
owner = "phaazon";
repo = pname;
rev = version;
- sha256 = "1c38q87fyfmj6nlwdpavb1xxpi26ncywkgqcwbvblad15c6ydcyc";
+ sha256 = "sha256-n9oIWblTTuXFFQFN6mpQiCH5N7yg5fAp8v9vpB5/DAo=";
};
- cargoSha256 = "0vrbgs49ghhl4z4ljhghcs9fnbf7qx1an9kwbrgv9wng8m1dccah";
+ cargoSha256 = "sha256-DsB2C2ELuvuVSvxG/xztmnY2qfX8+Y7udbXlpRQoL/c=";
meta = with lib; {
description = "A cargo plugin that generates a Markdown section in your README based on your Rust documentation";
homepage = "https://github.com/phaazon/cargo-sync-readme";
+ changelog = "https://github.com/phaazon/cargo-sync-readme/blob/${version}/CHANGELOG.md";
license = licenses.bsd3;
maintainers = with maintainers; [ b4dm4n ];
};
diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix
index 875ed794647d..73198af687cc 100644
--- a/pkgs/development/tools/wails/default.nix
+++ b/pkgs/development/tools/wails/default.nix
@@ -15,16 +15,16 @@
buildGoModule rec {
pname = "wails";
- version = "2.0.0-beta.34";
+ version = "2.0.0-beta.36";
src = fetchFromGitHub {
owner = "wailsapp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-dsDruZSmr8qSNpX8L27tLpNxvdSkc2mfNQLRxN9AnCg=";
+ sha256 = "sha256-uAbVc1UDgSNJwk8R6zXXqZImo6J9TRs3zPNlWelXS/I=";
} + "/v2";
- vendorSha256 = "sha256-OaSPpCb2VxMGlkUIg3fyEJhjz256amEfXBX+5WMY3a0=";
+ vendorSha256 = "sha256-rrwlFZQT7sHhUqtU4UzwEqZbjWd/1fudfj/xdTGFUmQ=";
proxyVendor = true;
diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix
index 562989d2fd31..6a55c20b195b 100644
--- a/pkgs/development/web/nodejs/v18.nix
+++ b/pkgs/development/web/nodejs/v18.nix
@@ -7,8 +7,8 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "18.0.0";
- sha256 = "sha256-NE0OZUC1JMaal5/1w+eM2nJU/XLANpmSa+sLhVi4znU=";
+ version = "18.1.0";
+ sha256 = "0zhb61ihzslmpl1g3dd6vcxjccc8gwj1v4hfphk7f3cy10hcrc78";
patches = [
./disable-darwin-v8-system-instrumentation.patch
];
diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix
index 8485a868d8a5..051ca1963051 100644
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/pkgs/os-specific/linux/nftables/default.nix
@@ -8,8 +8,6 @@
, withXtables ? true , iptables
}:
-with lib;
-
stdenv.mkDerivation rec {
version = "1.0.2";
pname = "nftables";
@@ -28,8 +26,8 @@ stdenv.mkDerivation rec {
buildInputs = [
libmnl libnftnl libpcap
gmp jansson libedit
- ] ++ optional withXtables iptables
- ++ optional withPython python3;
+ ] ++ lib.optional withXtables iptables
+ ++ lib.optional withPython python3;
preConfigure = ''
substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
@@ -46,12 +44,12 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-json"
"--with-cli=editline"
- ] ++ optional (!withDebugSymbols) "--disable-debug"
- ++ optional (!withPython) "--disable-python"
- ++ optional withPython "--enable-python"
- ++ optional withXtables "--with-xtables";
+ ] ++ lib.optional (!withDebugSymbols) "--disable-debug"
+ ++ lib.optional (!withPython) "--disable-python"
+ ++ lib.optional withPython "--enable-python"
+ ++ lib.optional withXtables "--with-xtables";
- meta = {
+ meta = with lib; {
description = "The project that aims to replace the existing {ip,ip6,arp,eb}tables framework";
homepage = "https://netfilter.org/projects/nftables/";
license = licenses.gpl2Only;
diff --git a/pkgs/os-specific/linux/vmware/default.nix b/pkgs/os-specific/linux/vmware/default.nix
new file mode 100644
index 000000000000..aa77a10015e6
--- /dev/null
+++ b/pkgs/os-specific/linux/vmware/default.nix
@@ -0,0 +1,47 @@
+{ lib, stdenv, fetchFromGitHub, kernel, kmod, gnugrep, vmware-workstation }:
+
+stdenv.mkDerivation rec {
+ pname = "vmware-modules";
+ version = "${vmware-workstation.version}-${kernel.version}";
+
+ src = fetchFromGitHub {
+ owner = "mkubecek";
+ repo = "vmware-host-modules";
+ rev = "w${vmware-workstation.version}-k5.17";
+ sha256 = "sha256-EM6YU2nOwNlAXpQ7cGrLS1N+gAS1KxleVjJTzo22De0=";
+ };
+
+ hardeningDisable = [ "pic" ];
+
+ nativeBuildInputs = kernel.moduleBuildDependencies;
+
+ enableParallelBuilding = true;
+
+ postPatch = ''
+ substituteInPlace Makefile \
+ --replace '/lib/modules/$(VM_UNAME)/misc' "$out/lib/modules/${kernel.modDirVersion}/misc" \
+ --replace '$(shell uname -r)' "${kernel.modDirVersion}" \
+ --replace /sbin/modinfo "${kmod}/bin/modinfo" \
+ --replace 'test -z "$(DESTDIR)"' "0"
+
+ for module in "vmmon-only" "vmnet-only"; do
+ substituteInPlace "./$module/Makefile" \
+ --replace '/lib/modules/' "${kernel.dev}/lib/modules/" \
+ --replace '$(shell uname -r)' "${kernel.modDirVersion}" \
+ --replace /bin/grep "${gnugrep}/bin/grep"
+ done
+ '';
+
+ preInstall = ''
+ mkdir -p "$out/lib/modules/${kernel.modDirVersion}/misc"
+ '';
+
+ meta = with lib; {
+ description = "Kernel modules needed for VMware hypervisor";
+ homepage = "https://github.com/mkubecek/vmware-host-modules";
+ license = licenses.gpl2Only;
+ platforms = [ "x86_64-linux" ];
+ broken = kernel.kernelOlder "5.5" && kernel.isHardened;
+ maintainers = with maintainers; [ deinferno ];
+ };
+}
diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix
index f28679f2cf5f..95a3ade822c1 100644
--- a/pkgs/servers/keycloak/default.nix
+++ b/pkgs/servers/keycloak/default.nix
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "keycloak";
- version = "17.0.1";
+ version = "18.0.0";
src = fetchzip {
url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
- sha256 = "sha256-z1LfTUoK+v4oQxdyIQruFhl5O333zirSrkPoTFgVfmI=";
+ sha256 = "0fxf9m50hpjplj077z2zjp0qibixz5y4lbc8159cnxbd4gzpkaaf";
};
nativeBuildInputs = [ makeWrapper jre ];
@@ -57,8 +57,8 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
- substituteInPlace $out/bin/kc.sh --replace '-Dkc.home.dir=$DIRNAME/../' '-Dkc.home.dir=$KC_HOME_DIR'
- substituteInPlace $out/bin/kc.sh --replace '-Djboss.server.config.dir=$DIRNAME/../conf' '-Djboss.server.config.dir=$KC_CONF_DIR'
+ substituteInPlace $out/bin/kc.sh --replace ${lib.escapeShellArg "-Dkc.home.dir='$DIRNAME'/../"} '-Dkc.home.dir=$KC_HOME_DIR'
+ substituteInPlace $out/bin/kc.sh --replace ${lib.escapeShellArg "-Djboss.server.config.dir='$DIRNAME'/../conf"} '-Djboss.server.config.dir=$KC_CONF_DIR'
for script in $(find $out/bin -type f -executable); do
wrapProgram "$script" --set JAVA_HOME ${jre} --prefix PATH : ${jre}/bin
diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix
index e93db302552f..fd0234e7e163 100644
--- a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix
@@ -1,19 +1,19 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "aws-s3-exporter";
- version = "0.4.1";
-
- goPackagePath = "github.com/ribbybibby/s3_exporter";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "ribbybibby";
repo = "s3_exporter";
rev = "v${version}";
- sha256 = "01g4k5wrbc2ggxkn4yqd2v0amw8yl5dbcfwi4jm3kqkihrf0rbiq";
+ sha256 = "sha256-dYkMCCAIlFDFOFUNJd4NvtAeJDTsHeJoH90b5pSGlQE=";
};
- doCheck = true;
+ vendorSha256 = null;
+
+ ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "Exports Prometheus metrics about S3 buckets and objects";
diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
index 6af1dbffbc88..f4c64d225e90 100644
--- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix
@@ -1,18 +1,20 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "haproxy_exporter";
- version = "0.12.0";
-
- goPackagePath = "github.com/prometheus/haproxy_exporter";
+ version = "0.13.0";
src = fetchFromGitHub {
- rev = "v${version}";
owner = "prometheus";
repo = "haproxy_exporter";
- sha256 = "09aqm2zqimn6w10p1nhnpjcigm299b31xfrq8ma0d7z4v9p2y9dn";
+ rev = "v${version}";
+ sha256 = "sha256-F0yYUIKTIGyhzL0QwmioQYnWBb0GeFOhBwL3IqDKoQA=";
};
+ vendorSha256 = "sha256-iJ2doxsLqTitsKJg3PUFLzEtLlP5QckSdFZkXX3ALIE=";
+
+ ldflags = [ "-s" "-w" ];
+
meta = with lib; {
description = "HAProxy Exporter for the Prometheus monitoring system";
homepage = "https://github.com/prometheus/haproxy_exporter";
diff --git a/pkgs/tools/admin/aws-google-auth/default.nix b/pkgs/tools/admin/aws-google-auth/default.nix
index 9330291014d1..aa1c77ef68e4 100644
--- a/pkgs/tools/admin/aws-google-auth/default.nix
+++ b/pkgs/tools/admin/aws-google-auth/default.nix
@@ -20,15 +20,15 @@
buildPythonApplication rec {
pname = "aws-google-auth";
- version = "0.0.37";
+ version = "0.0.38";
# Pypi doesn't ship the tests, so we fetch directly from GitHub
# https://github.com/cevoaustralia/aws-google-auth/issues/120
src = fetchFromGitHub {
owner = "cevoaustralia";
repo = "aws-google-auth";
- rev = version;
- sha256 = "1bh733n4m5rsslpbjvhdigx6768nrvacybkakrm9704d2md9vkqd";
+ rev = "refs/tags/${version}";
+ sha256 = "sha256-/Xe4RDA9sBEsBBV1VP91VX0VfO8alK8L70m9WrB7qu4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix
index 84781688ec1a..d917acd656c8 100644
--- a/pkgs/tools/admin/pgadmin/default.nix
+++ b/pkgs/tools/admin/pgadmin/default.nix
@@ -1,21 +1,21 @@
-{ stdenv
-, lib
+{ lib
, python3
, fetchurl
, zlib
, mkYarnModules
, sphinx
, nixosTests
+, pkgs
}:
let
pname = "pgadmin";
- version = "6.7";
+ version = "6.8";
src = fetchurl {
url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";
- sha256 = "1g2yxwgj9fp1fkn8j2jrdhmr2b2s6y8sgv4jq55aaxm4hfkkqh6d";
+ sha256 = "sha256-kS9GV/j28zkXTJZkRrG2JDgas210rQqXOJrwwxzepbw=";
};
yarnDeps = mkYarnModules {
@@ -25,9 +25,78 @@ let
yarnLock = ./yarn.lock;
yarnNix = ./yarn.nix;
};
+
+ # move buildDeps here to easily pass to test suite
+ buildDeps = with pythonPackages; [
+ flask
+ flask-gravatar
+ flask_login
+ flask_mail
+ flask_migrate
+ flask_sqlalchemy
+ flask_wtf
+ flask-compress
+ passlib
+ pytz
+ simplejson
+ six
+ sqlparse
+ wtforms
+ flask-paranoid
+ psutil
+ psycopg2
+ python-dateutil
+ sqlalchemy
+ itsdangerous
+ flask-security-too
+ bcrypt
+ cryptography
+ sshtunnel
+ ldap3
+ flask-babelex
+ flask-babel
+ gssapi
+ flask-socketio
+ eventlet
+ httpagentparser
+ user-agents
+ wheel
+ authlib
+ qrcode
+ pillow
+ pyotp
+ botocore
+ boto3
+ ];
+
+ # override necessary on pgadmin4 6.8
+ pythonPackages = python3.pkgs.overrideScope (final: prev: rec {
+ flask = prev.flask.overridePythonAttrs (oldAttrs: rec {
+ version = "2.0.3";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0=";
+ };
+ disabledTests = (oldAttrs.disabledTests or [ ]) ++ [
+ "test_aborting"
+ ];
+ });
+ flask-paranoid = prev.flask-paranoid.overridePythonAttrs (oldAttrs: rec {
+ # tests fail due to downgrades here
+ doCheck = false;
+ });
+ werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec {
+ version = "2.0.3";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw=";
+ };
+ });
+ });
+
in
-python3.pkgs.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
inherit pname version src;
# from Dockerfile
@@ -43,19 +112,19 @@ python3.pkgs.buildPythonApplication rec {
postPatch = ''
# patching Makefile, so it doesn't try to build sphinx documentation here
# (will do so later)
- substituteInPlace Makefile --replace "LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html" "true"
+ substituteInPlace Makefile --replace 'LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html' "true"
# fix document which refers a non-existing document and fails
substituteInPlace docs/en_US/contributions.rst --replace "code_snippets" ""
patchShebangs .
# relax dependencies
substituteInPlace requirements.txt \
- --replace "Pillow==8.3.*" "Pillow>=8.3.0" \
--replace "psycopg2==2.9.*" "psycopg2>=2.9" \
--replace "cryptography==3.*" "cryptography>=3.0" \
--replace "requests==2.25.*" "requests>=2.25.0" \
--replace "boto3==1.20.*" "boto3>=1.20" \
--replace "botocore==1.23.*" "botocore>=1.23" \
- --replace "pytz==2021.*" "pytz"
+ --replace "pytz==2021.*" "pytz" \
+ --replace "Werkzeug==2.0.3" "werkzeug>=2.*"
# don't use Server Mode (can be overridden later)
substituteInPlace pkg/pip/setup_pip.py \
--replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" \
@@ -101,10 +170,10 @@ python3.pkgs.buildPythonApplication rec {
cp -v ../pkg/pip/setup_pip.py setup.py
'';
- nativeBuildInputs = [ python3 python3.pkgs.cython python3.pkgs.pip ];
+ nativeBuildInputs = with pythonPackages; [ cython pip ];
buildInputs = [
zlib
- python3.pkgs.wheel
+ pythonPackages.wheel
];
# tests need an own data, log directory
@@ -112,57 +181,21 @@ python3.pkgs.buildPythonApplication rec {
# checks will be run through nixos/tests
doCheck = false;
- propagatedBuildInputs = with python3.pkgs; [
- flask
- flask-gravatar
- flask_login
- flask_mail
- flask_migrate
- flask_sqlalchemy
- flask_wtf
- flask-compress
- passlib
- pytz
- simplejson
- six
- speaklater3
- sqlparse
- wtforms
- flask-paranoid
- psutil
- psycopg2
- python-dateutil
- sqlalchemy
- itsdangerous
- flask-security-too
- bcrypt
- cryptography
- sshtunnel
- ldap3
- flask-babelex
- flask-babel
- gssapi
- flask-socketio
- eventlet
- httpagentparser
- user-agents
- wheel
- authlib
- qrcode
- pillow
- pyotp
- botocore
- boto3
- ];
+ # speaklater3 is seperate because when passing buildDeps
+ # to the test, it fails there due to a collision with speaklater
+ propagatedBuildInputs = buildDeps ++ [ pythonPackages.speaklater3 ];
- passthru = {
- tests = { inherit (nixosTests) pgadmin4 pgadmin4-standalone; };
+ passthru.tests = {
+ standalone = nixosTests.pgadmin4-standalone;
+ # regression and function tests of the package itself
+ package = (import ../../../../nixos/tests/pgadmin4.nix ({ inherit pkgs; buildDeps = buildDeps; pythonEnv = pythonPackages; }));
};
meta = with lib; {
description = "Administration and development platform for PostgreSQL";
homepage = "https://www.pgadmin.org/";
license = licenses.mit;
+ changelog = "https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_${lib.versions.major version}_${lib.versions.minor version}.html";
maintainers = with maintainers; [ gador ];
};
}
diff --git a/pkgs/tools/admin/pgadmin/package.json b/pkgs/tools/admin/pgadmin/package.json
index e4a27bd10d7b..d708b05e4883 100644
--- a/pkgs/tools/admin/pgadmin/package.json
+++ b/pkgs/tools/admin/pgadmin/package.json
@@ -8,8 +8,8 @@
"license": "PostgreSQL",
"devDependencies": {
"@babel/core": "^7.10.2",
- "@babel/eslint-parser": "^7.12.13",
- "@babel/eslint-plugin": "^7.12.13",
+ "@babel/eslint-parser": "^7.17.0",
+ "@babel/eslint-plugin": "^7.17.7",
"@babel/plugin-proposal-object-rest-spread": "^7.10.1",
"@babel/plugin-syntax-jsx": "^7.16.0",
"@babel/preset-env": "^7.10.2",
@@ -82,11 +82,12 @@
"@date-io/core": "^1.3.6",
"@date-io/date-fns": "1.x",
"@emotion/sheet": "^1.0.1",
- "@fortawesome/fontawesome-free": "^5.14.0",
"@material-ui/core": "4.11.0",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "4.0.0-alpha.58",
"@material-ui/pickers": "^3.2.10",
+ "@mui/icons-material": "^5.4.2",
+ "@mui/material": "^5.4.3",
"@projectstorm/react-diagrams": "^6.6.1",
"@simonwep/pickr": "^1.5.1",
"@szhsin/react-menu": "^2.2.0",
@@ -145,7 +146,7 @@
"path-fx": "^2.0.0",
"pathfinding": "^0.4.18",
"paths-js": "^0.4.9",
- "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422",
+ "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613",
"postcss": "^8.2.15",
"raf": "^3.4.1",
"rc-dock": "^3.2.9",
@@ -154,6 +155,8 @@
"react-checkbox-tree": "^1.7.2",
"react-dom": "^17.0.1",
"react-draggable": "^4.4.4",
+ "react-rnd": "^10.3.5",
+ "react-router-dom": "^6.2.2",
"react-select": "^4.2.1",
"react-table": "^7.6.3",
"react-timer-hook": "^3.0.5",
diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock
index 7dc709ab5add..bfb47913f8fb 100644
--- a/pkgs/tools/admin/pgadmin/yarn.lock
+++ b/pkgs/tools/admin/pgadmin/yarn.lock
@@ -91,19 +91,19 @@
json5 "^2.1.2"
semver "^6.3.0"
-"@babel/eslint-parser@^7.12.13":
- version "7.13.8"
- resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.13.8.tgz#6f2bde6b0690fcc0598b4869fc7c8e8b55b17687"
- integrity sha512-XewKkiyukrGzMeqToXJQk6hjg2veI9SNQElGzAoAjKxYCLbgcVX4KA2WhoyqMon9N4RMdCZhNTJNOBcp9spsiw==
+"@babel/eslint-parser@^7.17.0":
+ version "7.17.0"
+ resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz#eabb24ad9f0afa80e5849f8240d0e5facc2d90d6"
+ integrity sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==
dependencies:
- eslint-scope "5.1.0"
- eslint-visitor-keys "^1.3.0"
+ eslint-scope "^5.1.1"
+ eslint-visitor-keys "^2.1.0"
semver "^6.3.0"
-"@babel/eslint-plugin@^7.12.13":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.13.0.tgz#e6d99efcd6b8551adf479e382a47218726179b1b"
- integrity sha512-YGwCLc/u/uc3bU+q/fvgRQ62+TkxuyVvdmybK6ElzE49vODp+RnRe16eJzMM7EwvcRPQfQvcOSuGmzfcbZE2+w==
+"@babel/eslint-plugin@^7.17.7":
+ version "7.17.7"
+ resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.17.7.tgz#4ee1d5b29b79130f3bb5a933358376bcbee172b8"
+ integrity sha512-JATUoJJXSgwI0T8juxWYtK1JSgoLpIGUsCHIv+NMXcUDA2vIe6nvAHR9vnuJgs/P1hOFw7vPwibixzfqBBLIVw==
dependencies:
eslint-rule-composer "^0.3.0"
@@ -1741,6 +1741,13 @@
dependencies:
regenerator-runtime "^0.13.4"
+"@babel/runtime@^7.17.2", "@babel/runtime@^7.7.6":
+ version "7.17.8"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2"
+ integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==
+ dependencies:
+ regenerator-runtime "^0.13.4"
+
"@babel/template@^7.12.13", "@babel/template@^7.14.5":
version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"
@@ -1849,6 +1856,17 @@
"@emotion/weak-memoize" "^0.2.5"
stylis "^4.0.3"
+"@emotion/cache@^11.7.1":
+ version "11.7.1"
+ resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz#08d080e396a42e0037848214e8aa7bf879065539"
+ integrity sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A==
+ dependencies:
+ "@emotion/memoize" "^0.7.4"
+ "@emotion/sheet" "^1.1.0"
+ "@emotion/utils" "^1.0.0"
+ "@emotion/weak-memoize" "^0.2.5"
+ stylis "4.0.13"
+
"@emotion/core@^10.0.14":
version "10.1.1"
resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.1.1.tgz#c956c1365f2f2481960064bcb8c4732e5fb612c3"
@@ -1882,6 +1900,13 @@
dependencies:
"@emotion/memoize" "0.7.4"
+"@emotion/is-prop-valid@^1.1.2":
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz#34ad6e98e871aa6f7a20469b602911b8b11b3a95"
+ integrity sha512-3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ==
+ dependencies:
+ "@emotion/memoize" "^0.7.4"
+
"@emotion/memoize@0.7.4":
version "0.7.4"
resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb"
@@ -1937,6 +1962,11 @@
resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.1.tgz#245f54abb02dfd82326e28689f34c27aa9b2a698"
integrity sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g==
+"@emotion/sheet@^1.1.0":
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz#56d99c41f0a1cda2726a05aa6a20afd4c63e58d2"
+ integrity sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g==
+
"@emotion/styled-base@^10.0.27":
version "10.0.31"
resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.31.tgz#940957ee0aa15c6974adc7d494ff19765a2f742a"
@@ -2117,6 +2147,93 @@
prop-types "^15.7.2"
react-is "^16.8.0 || ^17.0.0"
+"@mui/base@5.0.0-alpha.74":
+ version "5.0.0-alpha.74"
+ resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.74.tgz#15509242e7911446d5957375b1b18cbb72b3a750"
+ integrity sha512-pw3T1xNXpW8pLo9+BvtyazZb0CSjNJsjbzznlbV/aNkBfjNPXQVI3X1NDm3WSI8y6M96WDIVO7XrHAohOwALSQ==
+ dependencies:
+ "@babel/runtime" "^7.17.2"
+ "@emotion/is-prop-valid" "^1.1.2"
+ "@mui/types" "^7.1.3"
+ "@mui/utils" "^5.5.3"
+ "@popperjs/core" "^2.11.4"
+ clsx "^1.1.1"
+ prop-types "^15.7.2"
+ react-is "^17.0.2"
+
+"@mui/icons-material@^5.4.2":
+ version "5.5.1"
+ resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.5.1.tgz#848a57972617411370775980cbc6990588d4aafb"
+ integrity sha512-40f68p5+Yhq3dCn3QYHqQt5RETPyR3AkDw+fma8PtcjqvZ+d+jF84kFmT6NqwA3he7TlwluEtkyAmPzUE4uPdA==
+ dependencies:
+ "@babel/runtime" "^7.17.2"
+
+"@mui/material@^5.4.3":
+ version "5.5.3"
+ resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.5.3.tgz#411e53a69da3f9d6664e99f1bdcdaf2760540fdc"
+ integrity sha512-eADa3kUYbbr1jNjcufn0a7HeU8cSo0agbrkj720hodxVFNIfzq7a2e58Z+PaZqll55kMGBvlYJ7rTcXU399x5A==
+ dependencies:
+ "@babel/runtime" "^7.17.2"
+ "@mui/base" "5.0.0-alpha.74"
+ "@mui/system" "^5.5.3"
+ "@mui/types" "^7.1.3"
+ "@mui/utils" "^5.5.3"
+ "@types/react-transition-group" "^4.4.4"
+ clsx "^1.1.1"
+ csstype "^3.0.11"
+ hoist-non-react-statics "^3.3.2"
+ prop-types "^15.7.2"
+ react-is "^17.0.2"
+ react-transition-group "^4.4.2"
+
+"@mui/private-theming@^5.5.3":
+ version "5.5.3"
+ resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.5.3.tgz#c232a39dd3c268fdef7e92ccc40d51bda9eec3ab"
+ integrity sha512-Wf7NurY7lk8SBWelSBY2U02zxLt1773JpIcXTHuEC9/GZdQA4CXCJGl2cVQzheKhee5rZ+8JwGulrRiVl1m+4A==
+ dependencies:
+ "@babel/runtime" "^7.17.2"
+ "@mui/utils" "^5.5.3"
+ prop-types "^15.7.2"
+
+"@mui/styled-engine@^5.5.2":
+ version "5.5.2"
+ resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.5.2.tgz#1f92dd27d76f0b7df7aa52c7c7a710e59b2275a6"
+ integrity sha512-jkz5AHHbA43akBo5L3y1X1/X0f+RvXvCp3eXKt+iOf3qnKSAausbtlVz7gBbC4xIWDnP1Jb/6T+t/0/7gObRYA==
+ dependencies:
+ "@babel/runtime" "^7.17.2"
+ "@emotion/cache" "^11.7.1"
+ prop-types "^15.7.2"
+
+"@mui/system@^5.5.3":
+ version "5.5.3"
+ resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.5.3.tgz#c78d4c16009430389ffd3495d694945422d72ca5"
+ integrity sha512-J9JcySJuEqfEoP334K/2gEWm2vOx73Uqjii3qlFVhWRBOAJ0Pjyk0sN5W/eVRbwhUm95DNgh2V5s8dRK3vzyVw==
+ dependencies:
+ "@babel/runtime" "^7.17.2"
+ "@mui/private-theming" "^5.5.3"
+ "@mui/styled-engine" "^5.5.2"
+ "@mui/types" "^7.1.3"
+ "@mui/utils" "^5.5.3"
+ clsx "^1.1.1"
+ csstype "^3.0.11"
+ prop-types "^15.7.2"
+
+"@mui/types@^7.1.3":
+ version "7.1.3"
+ resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.1.3.tgz#d7636f3046110bcccc63e6acfd100e2ad9ca712a"
+ integrity sha512-DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA==
+
+"@mui/utils@^5.5.3":
+ version "5.5.3"
+ resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.5.3.tgz#f6e1f10c0e8f4d0bf750588c2c3a96ad819c5b65"
+ integrity sha512-t627eVRpl3SlxVya0cIVNs8jPl4KCEiGaTSWY9iKKTcMNaeDbuRML+zv/CFHDPr1zFv+FjJSP02ySB+tZ8xIag==
+ dependencies:
+ "@babel/runtime" "^7.17.2"
+ "@types/prop-types" "^15.7.4"
+ "@types/react-is" "^16.7.1 || ^17.0.0"
+ prop-types "^15.7.2"
+ react-is "^17.0.2"
+
"@nodelib/fs.scandir@2.1.4":
version "2.1.4"
resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
@@ -2159,6 +2276,11 @@
resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.15.tgz#6a9d143f7f4f49db2d782f9e1c8839a29b43ae23"
integrity sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==
+"@popperjs/core@^2.11.4":
+ version "2.11.4"
+ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.4.tgz#d8c7b8db9226d2d7664553a0741ad7d0397ee503"
+ integrity sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg==
+
"@popperjs/core@^2.8.3":
version "2.9.0"
resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.0.tgz#32e63212293dd3efbb521cd35a5020ab66eaa546"
@@ -2436,6 +2558,11 @@
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
+"@types/prop-types@^15.7.4":
+ version "15.7.4"
+ resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11"
+ integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==
+
"@types/q@^1.5.1":
version "1.5.4"
resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"
@@ -2448,6 +2575,13 @@
dependencies:
"@types/react" "^16"
+"@types/react-is@^16.7.1 || ^17.0.0":
+ version "17.0.3"
+ resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.3.tgz#2d855ba575f2fc8d17ef9861f084acc4b90a137a"
+ integrity sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw==
+ dependencies:
+ "@types/react" "*"
+
"@types/react-transition-group@^4.2.0":
version "4.4.1"
resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.1.tgz#e1a3cb278df7f47f17b5082b1b3da17170bd44b1"
@@ -2455,6 +2589,13 @@
dependencies:
"@types/react" "*"
+"@types/react-transition-group@^4.4.4":
+ version "4.4.4"
+ resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz#acd4cceaa2be6b757db61ed7b432e103242d163e"
+ integrity sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==
+ dependencies:
+ "@types/react" "*"
+
"@types/react@*", "@types/react@^16":
version "16.14.10"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.10.tgz#76bc1c42ed5ab0d2ab13e5c58faaccaad3449477"
@@ -4540,6 +4681,11 @@ csstype@^2.5.2, csstype@^2.5.7:
resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.16.tgz#544d69f547013b85a40d15bff75db38f34fe9c39"
integrity sha512-61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q==
+csstype@^3.0.11:
+ version "3.0.11"
+ resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33"
+ integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==
+
csstype@^3.0.2:
version "3.0.8"
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340"
@@ -5223,14 +5369,6 @@ eslint-rule-composer@^0.3.0:
resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"
integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==
-eslint-scope@5.1.0:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5"
- integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==
- dependencies:
- esrecurse "^4.1.0"
- estraverse "^4.1.1"
-
eslint-scope@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
@@ -5251,7 +5389,7 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
-eslint-visitor-keys@^2.0.0:
+eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
@@ -5320,7 +5458,7 @@ esquery@^1.4.0:
dependencies:
estraverse "^5.1.0"
-esrecurse@^4.1.0, esrecurse@^4.3.0:
+esrecurse@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
@@ -5498,6 +5636,11 @@ fast-levenshtein@^2.0.6:
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+fast-memoize@^2.5.1:
+ version "2.5.2"
+ resolved "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz#79e3bb6a4ec867ea40ba0e7146816f6cdce9b57e"
+ integrity sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==
+
fast-safe-stringify@^2.0.7:
version "2.0.7"
resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743"
@@ -6059,6 +6202,13 @@ hex-color-regex@^1.1.0:
resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
+history@^5.2.0:
+ version "5.3.0"
+ resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b"
+ integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==
+ dependencies:
+ "@babel/runtime" "^7.7.6"
+
hmac-drbg@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -8351,9 +8501,9 @@ performance-now@^2.1.0:
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422":
+"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613":
version "1.0.0"
- resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422"
+ resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613"
dependencies:
"@types/classnames" "^2.2.6"
"@types/react" "^16.7.18"
@@ -9023,6 +9173,13 @@ rc-util@^5.12.0, rc-util@^5.15.0, rc-util@^5.2.1, rc-util@^5.3.0, rc-util@^5.5.0
react-is "^16.12.0"
shallowequal "^1.1.0"
+re-resizable@6.9.1:
+ version "6.9.1"
+ resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.1.tgz#6be082b55d02364ca4bfee139e04feebdf52441c"
+ integrity sha512-KRYAgr9/j1PJ3K+t+MBhlQ+qkkoLDJ1rs0z1heIWvYbCW/9Vq4djDU+QumJ3hQbwwtzXF6OInla6rOx6hhgRhQ==
+ dependencies:
+ fast-memoize "^2.5.1"
+
react-aspen@^1.1.0, react-aspen@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/react-aspen/-/react-aspen-1.1.1.tgz#61a85ef43748158322c4a3b73faaa5e563edd038"
@@ -9063,6 +9220,14 @@ react-dom@^17.0.1:
object-assign "^4.1.1"
scheduler "^0.20.2"
+react-draggable@4.4.3:
+ version "4.4.3"
+ resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz#0727f2cae5813e36b0e4962bf11b2f9ef2b406f3"
+ integrity sha512-jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w==
+ dependencies:
+ classnames "^2.2.5"
+ prop-types "^15.6.0"
+
react-draggable@^4.4.4:
version "4.4.4"
resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.4.tgz#5b26d9996be63d32d285a426f41055de87e59b2f"
@@ -9093,6 +9258,30 @@ react-property@1.0.1:
resolved "https://registry.yarnpkg.com/react-property/-/react-property-1.0.1.tgz#4ae4211557d0a0ae050a71aa8ad288c074bea4e6"
integrity sha512-1tKOwxFn3dXVomH6pM9IkLkq2Y8oh+fh/lYW3MJ/B03URswUTqttgckOlbxY2XHF3vPG6uanSc4dVsLW/wk3wQ==
+react-rnd@^10.3.5:
+ version "10.3.5"
+ resolved "https://registry.yarnpkg.com/react-rnd/-/react-rnd-10.3.5.tgz#b66e5e06f1eb6823e72eb4b552081b4b9241b139"
+ integrity sha512-LWJP+l5bp76sDPKrKM8pwGJifI6i3B5jHK4ONACczVMbR8ycNGA75ORRqpRuXGyKawUs68s1od05q8cqWgQXgw==
+ dependencies:
+ re-resizable "6.9.1"
+ react-draggable "4.4.3"
+ tslib "2.3.0"
+
+react-router-dom@^6.2.2:
+ version "6.3.0"
+ resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz#a0216da813454e521905b5fa55e0e5176123f43d"
+ integrity sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==
+ dependencies:
+ history "^5.2.0"
+ react-router "6.3.0"
+
+react-router@6.3.0:
+ version "6.3.0"
+ resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557"
+ integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==
+ dependencies:
+ history "^5.2.0"
+
react-select@^4.2.1:
version "4.3.1"
resolved "https://registry.yarnpkg.com/react-select/-/react-select-4.3.1.tgz#389fc07c9bc7cf7d3c377b7a05ea18cd7399cb81"
@@ -9144,6 +9333,16 @@ react-transition-group@^4.0.0, react-transition-group@^4.3.0, react-transition-g
loose-envify "^1.4.0"
prop-types "^15.6.2"
+react-transition-group@^4.4.2:
+ version "4.4.2"
+ resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470"
+ integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==
+ dependencies:
+ "@babel/runtime" "^7.5.5"
+ dom-helpers "^5.0.1"
+ loose-envify "^1.4.0"
+ prop-types "^15.6.2"
+
react-transition-state@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/react-transition-state/-/react-transition-state-1.1.3.tgz#6d999dc640ffd3a7442021a14a58e13347f4e95f"
@@ -10161,6 +10360,11 @@ stylehacks@^5.0.1:
browserslist "^4.16.0"
postcss-selector-parser "^6.0.4"
+stylis@4.0.13:
+ version "4.0.13"
+ resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91"
+ integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==
+
stylis@^4.0.3, stylis@^4.0.7:
version "4.0.10"
resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz#446512d1097197ab3f02fb3c258358c3f7a14240"
@@ -10511,6 +10715,11 @@ trim-right@^1.0.1:
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
+tslib@2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
+ integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
+
tslib@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
diff --git a/pkgs/tools/admin/pgadmin/yarn.nix b/pkgs/tools/admin/pgadmin/yarn.nix
index eca056bc9218..9e2ed892fcd2 100644
--- a/pkgs/tools/admin/pgadmin/yarn.nix
+++ b/pkgs/tools/admin/pgadmin/yarn.nix
@@ -74,19 +74,19 @@
};
}
{
- name = "_babel_eslint_parser___eslint_parser_7.13.8.tgz";
+ name = "_babel_eslint_parser___eslint_parser_7.17.0.tgz";
path = fetchurl {
- name = "_babel_eslint_parser___eslint_parser_7.13.8.tgz";
- url = "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.13.8.tgz";
- sha512 = "XewKkiyukrGzMeqToXJQk6hjg2veI9SNQElGzAoAjKxYCLbgcVX4KA2WhoyqMon9N4RMdCZhNTJNOBcp9spsiw==";
+ name = "_babel_eslint_parser___eslint_parser_7.17.0.tgz";
+ url = "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz";
+ sha512 = "PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==";
};
}
{
- name = "_babel_eslint_plugin___eslint_plugin_7.13.0.tgz";
+ name = "_babel_eslint_plugin___eslint_plugin_7.17.7.tgz";
path = fetchurl {
- name = "_babel_eslint_plugin___eslint_plugin_7.13.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.13.0.tgz";
- sha512 = "YGwCLc/u/uc3bU+q/fvgRQ62+TkxuyVvdmybK6ElzE49vODp+RnRe16eJzMM7EwvcRPQfQvcOSuGmzfcbZE2+w==";
+ name = "_babel_eslint_plugin___eslint_plugin_7.17.7.tgz";
+ url = "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.17.7.tgz";
+ sha512 = "JATUoJJXSgwI0T8juxWYtK1JSgoLpIGUsCHIv+NMXcUDA2vIe6nvAHR9vnuJgs/P1hOFw7vPwibixzfqBBLIVw==";
};
}
{
@@ -1577,6 +1577,14 @@
sha512 = "etcO/ohMNaNA2UBdaXBBSX/3aEzFMRrVfaPv8Ptc0k+cWpWW0QFiGZ2XnVqQZI1Cf734LbPGmqBKWESfW4x/dQ==";
};
}
+ {
+ name = "_babel_runtime___runtime_7.17.8.tgz";
+ path = fetchurl {
+ name = "_babel_runtime___runtime_7.17.8.tgz";
+ url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz";
+ sha512 = "dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==";
+ };
+ }
{
name = "_babel_template___template_7.14.5.tgz";
path = fetchurl {
@@ -1673,6 +1681,14 @@
sha512 = "Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g==";
};
}
+ {
+ name = "_emotion_cache___cache_11.7.1.tgz";
+ path = fetchurl {
+ name = "_emotion_cache___cache_11.7.1.tgz";
+ url = "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz";
+ sha512 = "r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A==";
+ };
+ }
{
name = "_emotion_core___core_10.1.1.tgz";
path = fetchurl {
@@ -1705,6 +1721,14 @@
sha512 = "u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==";
};
}
+ {
+ name = "_emotion_is_prop_valid___is_prop_valid_1.1.2.tgz";
+ path = fetchurl {
+ name = "_emotion_is_prop_valid___is_prop_valid_1.1.2.tgz";
+ url = "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz";
+ sha512 = "3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ==";
+ };
+ }
{
name = "_emotion_memoize___memoize_0.7.4.tgz";
path = fetchurl {
@@ -1761,6 +1785,14 @@
sha512 = "GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g==";
};
}
+ {
+ name = "_emotion_sheet___sheet_1.1.0.tgz";
+ path = fetchurl {
+ name = "_emotion_sheet___sheet_1.1.0.tgz";
+ url = "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz";
+ sha512 = "u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g==";
+ };
+ }
{
name = "_emotion_styled_base___styled_base_10.0.31.tgz";
path = fetchurl {
@@ -1929,6 +1961,70 @@
sha512 = "Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA==";
};
}
+ {
+ name = "_mui_base___base_5.0.0_alpha.74.tgz";
+ path = fetchurl {
+ name = "_mui_base___base_5.0.0_alpha.74.tgz";
+ url = "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.74.tgz";
+ sha512 = "pw3T1xNXpW8pLo9+BvtyazZb0CSjNJsjbzznlbV/aNkBfjNPXQVI3X1NDm3WSI8y6M96WDIVO7XrHAohOwALSQ==";
+ };
+ }
+ {
+ name = "_mui_icons_material___icons_material_5.5.1.tgz";
+ path = fetchurl {
+ name = "_mui_icons_material___icons_material_5.5.1.tgz";
+ url = "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.5.1.tgz";
+ sha512 = "40f68p5+Yhq3dCn3QYHqQt5RETPyR3AkDw+fma8PtcjqvZ+d+jF84kFmT6NqwA3he7TlwluEtkyAmPzUE4uPdA==";
+ };
+ }
+ {
+ name = "_mui_material___material_5.5.3.tgz";
+ path = fetchurl {
+ name = "_mui_material___material_5.5.3.tgz";
+ url = "https://registry.yarnpkg.com/@mui/material/-/material-5.5.3.tgz";
+ sha512 = "eADa3kUYbbr1jNjcufn0a7HeU8cSo0agbrkj720hodxVFNIfzq7a2e58Z+PaZqll55kMGBvlYJ7rTcXU399x5A==";
+ };
+ }
+ {
+ name = "_mui_private_theming___private_theming_5.5.3.tgz";
+ path = fetchurl {
+ name = "_mui_private_theming___private_theming_5.5.3.tgz";
+ url = "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.5.3.tgz";
+ sha512 = "Wf7NurY7lk8SBWelSBY2U02zxLt1773JpIcXTHuEC9/GZdQA4CXCJGl2cVQzheKhee5rZ+8JwGulrRiVl1m+4A==";
+ };
+ }
+ {
+ name = "_mui_styled_engine___styled_engine_5.5.2.tgz";
+ path = fetchurl {
+ name = "_mui_styled_engine___styled_engine_5.5.2.tgz";
+ url = "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.5.2.tgz";
+ sha512 = "jkz5AHHbA43akBo5L3y1X1/X0f+RvXvCp3eXKt+iOf3qnKSAausbtlVz7gBbC4xIWDnP1Jb/6T+t/0/7gObRYA==";
+ };
+ }
+ {
+ name = "_mui_system___system_5.5.3.tgz";
+ path = fetchurl {
+ name = "_mui_system___system_5.5.3.tgz";
+ url = "https://registry.yarnpkg.com/@mui/system/-/system-5.5.3.tgz";
+ sha512 = "J9JcySJuEqfEoP334K/2gEWm2vOx73Uqjii3qlFVhWRBOAJ0Pjyk0sN5W/eVRbwhUm95DNgh2V5s8dRK3vzyVw==";
+ };
+ }
+ {
+ name = "_mui_types___types_7.1.3.tgz";
+ path = fetchurl {
+ name = "_mui_types___types_7.1.3.tgz";
+ url = "https://registry.yarnpkg.com/@mui/types/-/types-7.1.3.tgz";
+ sha512 = "DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA==";
+ };
+ }
+ {
+ name = "_mui_utils___utils_5.5.3.tgz";
+ path = fetchurl {
+ name = "_mui_utils___utils_5.5.3.tgz";
+ url = "https://registry.yarnpkg.com/@mui/utils/-/utils-5.5.3.tgz";
+ sha512 = "t627eVRpl3SlxVya0cIVNs8jPl4KCEiGaTSWY9iKKTcMNaeDbuRML+zv/CFHDPr1zFv+FjJSP02ySB+tZ8xIag==";
+ };
+ }
{
name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz";
path = fetchurl {
@@ -1977,6 +2073,14 @@
sha512 = "15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==";
};
}
+ {
+ name = "_popperjs_core___core_2.11.4.tgz";
+ path = fetchurl {
+ name = "_popperjs_core___core_2.11.4.tgz";
+ url = "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.4.tgz";
+ sha512 = "q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg==";
+ };
+ }
{
name = "_popperjs_core___core_2.9.0.tgz";
path = fetchurl {
@@ -2313,6 +2417,14 @@
sha512 = "KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==";
};
}
+ {
+ name = "_types_prop_types___prop_types_15.7.4.tgz";
+ path = fetchurl {
+ name = "_types_prop_types___prop_types_15.7.4.tgz";
+ url = "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz";
+ sha512 = "rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==";
+ };
+ }
{
name = "_types_q___q_1.5.4.tgz";
path = fetchurl {
@@ -2329,6 +2441,14 @@
sha512 = "FIX2AVmPTGP30OUJ+0vadeIFJJ07Mh1m+U0rxfgyW34p3rTlXI+nlenvAxNn4BP36YyI9IJ/+UJ7Wu22N1pI7A==";
};
}
+ {
+ name = "_types_react_is___react_is_17.0.3.tgz";
+ path = fetchurl {
+ name = "_types_react_is___react_is_17.0.3.tgz";
+ url = "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.3.tgz";
+ sha512 = "aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw==";
+ };
+ }
{
name = "_types_react_transition_group___react_transition_group_4.4.1.tgz";
path = fetchurl {
@@ -2337,6 +2457,14 @@
sha512 = "vIo69qKKcYoJ8wKCJjwSgCTM+z3chw3g18dkrDfVX665tMH7tmbDxEAnPdey4gTlwZz5QuHGzd+hul0OVZDqqQ==";
};
}
+ {
+ name = "_types_react_transition_group___react_transition_group_4.4.4.tgz";
+ path = fetchurl {
+ name = "_types_react_transition_group___react_transition_group_4.4.4.tgz";
+ url = "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz";
+ sha512 = "7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==";
+ };
+ }
{
name = "_types_react___react_16.14.10.tgz";
path = fetchurl {
@@ -4473,6 +4601,14 @@
sha512 = "61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q==";
};
}
+ {
+ name = "csstype___csstype_3.0.11.tgz";
+ path = fetchurl {
+ name = "csstype___csstype_3.0.11.tgz";
+ url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz";
+ sha512 = "sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==";
+ };
+ }
{
name = "csstype___csstype_3.0.8.tgz";
path = fetchurl {
@@ -5185,14 +5321,6 @@
sha512 = "bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==";
};
}
- {
- name = "eslint_scope___eslint_scope_5.1.0.tgz";
- path = fetchurl {
- name = "eslint_scope___eslint_scope_5.1.0.tgz";
- url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz";
- sha512 = "iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==";
- };
- }
{
name = "eslint_scope___eslint_scope_5.1.1.tgz";
path = fetchurl {
@@ -5441,6 +5569,14 @@
sha1 = "PYpcZog6FqMMqGQ+hR8Zuqd5eRc=";
};
}
+ {
+ name = "fast_memoize___fast_memoize_2.5.2.tgz";
+ path = fetchurl {
+ name = "fast_memoize___fast_memoize_2.5.2.tgz";
+ url = "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz";
+ sha512 = "Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==";
+ };
+ }
{
name = "fast_safe_stringify___fast_safe_stringify_2.0.7.tgz";
path = fetchurl {
@@ -6081,6 +6217,14 @@
sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==";
};
}
+ {
+ name = "history___history_5.3.0.tgz";
+ path = fetchurl {
+ name = "history___history_5.3.0.tgz";
+ url = "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz";
+ sha512 = "ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==";
+ };
+ }
{
name = "hmac_drbg___hmac_drbg_1.0.1.tgz";
path = fetchurl {
@@ -8823,8 +8967,8 @@
let
repo = fetchgit {
url = "https://github.com/EnterpriseDB/pgadmin4-treeview/";
- rev = "bf7ac7be65898883e3e05c9733426152a1da6422";
- sha256 = "0nsn7s0d1kpgpb554hkz7nsifzdyff06qc78gqmzd8j3sfcbjk63";
+ rev = "c966febebcdffaa46f1ccf0769fe5308f179d613";
+ sha256 = "0fxjalh7g8fwy3fczbj9pvf8g06chq41gw1jidz106wadjr72081";
};
in
runCommand "pgadmin4-treeview" { buildInputs = [gnutar]; } ''
@@ -9553,6 +9697,14 @@
sha512 = "HWuTIKzBeZQQ7IBqdokE0wMp/xx39/KfUJ0gcquBigoldDCrf3YBcWFHrrQlJG7sI82Wg8mwp1uAKV3zMGfAgg==";
};
}
+ {
+ name = "re_resizable___re_resizable_6.9.1.tgz";
+ path = fetchurl {
+ name = "re_resizable___re_resizable_6.9.1.tgz";
+ url = "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.1.tgz";
+ sha512 = "KRYAgr9/j1PJ3K+t+MBhlQ+qkkoLDJ1rs0z1heIWvYbCW/9Vq4djDU+QumJ3hQbwwtzXF6OInla6rOx6hhgRhQ==";
+ };
+ }
{
name = "react_aspen___react_aspen_1.1.1.tgz";
path = fetchurl {
@@ -9585,6 +9737,14 @@
sha512 = "s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==";
};
}
+ {
+ name = "react_draggable___react_draggable_4.4.3.tgz";
+ path = fetchurl {
+ name = "react_draggable___react_draggable_4.4.3.tgz";
+ url = "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz";
+ sha512 = "jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w==";
+ };
+ }
{
name = "react_draggable___react_draggable_4.4.4.tgz";
path = fetchurl {
@@ -9625,6 +9785,30 @@
sha512 = "1tKOwxFn3dXVomH6pM9IkLkq2Y8oh+fh/lYW3MJ/B03URswUTqttgckOlbxY2XHF3vPG6uanSc4dVsLW/wk3wQ==";
};
}
+ {
+ name = "react_rnd___react_rnd_10.3.5.tgz";
+ path = fetchurl {
+ name = "react_rnd___react_rnd_10.3.5.tgz";
+ url = "https://registry.yarnpkg.com/react-rnd/-/react-rnd-10.3.5.tgz";
+ sha512 = "LWJP+l5bp76sDPKrKM8pwGJifI6i3B5jHK4ONACczVMbR8ycNGA75ORRqpRuXGyKawUs68s1od05q8cqWgQXgw==";
+ };
+ }
+ {
+ name = "react_router_dom___react_router_dom_6.3.0.tgz";
+ path = fetchurl {
+ name = "react_router_dom___react_router_dom_6.3.0.tgz";
+ url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz";
+ sha512 = "uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==";
+ };
+ }
+ {
+ name = "react_router___react_router_6.3.0.tgz";
+ path = fetchurl {
+ name = "react_router___react_router_6.3.0.tgz";
+ url = "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz";
+ sha512 = "7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==";
+ };
+ }
{
name = "react_select___react_select_4.3.1.tgz";
path = fetchurl {
@@ -9673,6 +9857,14 @@
sha512 = "Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==";
};
}
+ {
+ name = "react_transition_group___react_transition_group_4.4.2.tgz";
+ path = fetchurl {
+ name = "react_transition_group___react_transition_group_4.4.2.tgz";
+ url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz";
+ sha512 = "/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==";
+ };
+ }
{
name = "react_transition_state___react_transition_state_1.1.3.tgz";
path = fetchurl {
@@ -10865,6 +11057,14 @@
sha512 = "Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA==";
};
}
+ {
+ name = "stylis___stylis_4.0.13.tgz";
+ path = fetchurl {
+ name = "stylis___stylis_4.0.13.tgz";
+ url = "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz";
+ sha512 = "xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==";
+ };
+ }
{
name = "stylis___stylis_4.0.10.tgz";
path = fetchurl {
@@ -11233,6 +11433,14 @@
sha1 = "yy4SAwZ+DI3h9hQJS5/kVwTqYAM=";
};
}
+ {
+ name = "tslib___tslib_2.3.0.tgz";
+ path = fetchurl {
+ name = "tslib___tslib_2.3.0.tgz";
+ url = "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz";
+ sha512 = "N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==";
+ };
+ }
{
name = "tslib___tslib_2.2.0.tgz";
path = fetchurl {
diff --git a/pkgs/tools/admin/winbox/default.nix b/pkgs/tools/admin/winbox/default.nix
index c845d890ce50..ae55eb4ed69e 100644
--- a/pkgs/tools/admin/winbox/default.nix
+++ b/pkgs/tools/admin/winbox/default.nix
@@ -70,7 +70,7 @@ symlinkJoin {
homepage = "https://mikrotik.com";
downloadPage = "https://mikrotik.com/download";
changelog = "https://wiki.mikrotik.com/wiki/Winbox_changelog";
- license = licenses.gpl3Plus;
+ license = licenses.unfree;
maintainers = with maintainers; [ yrd ];
};
}
diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix
index 0364065be24c..b34b1ee4d517 100644
--- a/pkgs/tools/misc/cht.sh/default.nix
+++ b/pkgs/tools/misc/cht.sh/default.nix
@@ -10,15 +10,15 @@
stdenv.mkDerivation {
pname = "cht.sh";
- version = "unstable-2022-04-17";
+ version = "unstable-2022-04-18";
nativeBuildInputs = [ makeWrapper ];
src = fetchFromGitHub {
owner = "chubin";
repo = "cheat.sh";
- rev = "7f769d6f3697541e55fd3ea9b71f190296529e48";
- sha256 = "+V3q71neW9X0JPJHqvNGopvIJfUv0VD9GKkz7YqN6Eo=";
+ rev = "571377f2f79422398a701cb1864487124ec3dcc6";
+ sha256 = "0e9YhYcxU9t0SFeT1TjoRGTM3h1xRC528ae69tvz+a0=";
};
# Fix ".cht.sh-wrapped" in the help message
diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix
index e4e77ba90e25..874e3525f691 100644
--- a/pkgs/tools/misc/fclones/default.nix
+++ b/pkgs/tools/misc/fclones/default.nix
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "fclones";
- version = "0.22.0";
+ version = "0.23.0";
src = fetchFromGitHub {
owner = "pkolaczk";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-gzNrZJz0nC1N7LUyN5q16Vva1SD0jh7cBVV36927pmY=";
+ sha256 = "sha256-ICuhBoiCBmoy+jW+OK5OU5oAopyyOxSB6uHpZv2dEKI=";
};
- cargoSha256 = "sha256-yooY58PZbraDYc+mvmDgKZ3CdvVkbKM/f/DcU0xDiNo=";
+ cargoSha256 = "sha256-NXkXxRDJcfB2F7hXF5nBFnQ+IFhZTSHg915NyRyuS8c=";
buildInputs = lib.optionals stdenv.isDarwin [
AppKit
diff --git a/pkgs/tools/misc/rust-motd/default.nix b/pkgs/tools/misc/rust-motd/default.nix
index cdc3dbdae101..bfd4db8ff882 100644
--- a/pkgs/tools/misc/rust-motd/default.nix
+++ b/pkgs/tools/misc/rust-motd/default.nix
@@ -9,21 +9,23 @@
rustPlatform.buildRustPackage rec {
pname = "rust-motd";
- version = "0.1.1";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "rust-motd";
repo = pname;
rev = "v${version}";
- sha256 = "0xhdbhl0riaq9n4g9n333pgw966bsi60zpcy7gpndzfj21bj2x1m";
+ sha256 = "sha256-iuADR7m+wdmsQ897o4CQHqDv9PmYu/vJgO5C6Dluao4=";
};
- cargoSha256 = "sha256-l9Sit+niCLOnL1mdK6i8jea8NWsJlFM6p9lMTXyWOKY=";
+ cargoSha256 = "sha256-kdSMcADoTpMU4w2XSv0pPQZC155rrQACQ4XTVyj7eeA=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
+ OPENSSL_NO_VENDOR = 1;
+
meta = with lib; {
description = "Beautiful, useful MOTD generation with zero runtime dependencies";
homepage = "https://github.com/rust-motd/rust-motd";
diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/tools/networking/pssh/default.nix
index 1d7d006f537a..69236a690968 100644
--- a/pkgs/tools/networking/pssh/default.nix
+++ b/pkgs/tools/networking/pssh/default.nix
@@ -1,14 +1,14 @@
-{ lib, fetchFromGitHub, python2Packages, openssh, rsync }:
+{ lib, fetchFromGitHub, python3Packages, openssh, rsync }:
-python2Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "pssh";
- version = "2.3.1";
+ version = "2.3.4";
src = fetchFromGitHub {
owner = "lilydjwg";
repo = "pssh";
rev = "v${version}";
- sha256 = "0nawarxczfwajclnlsimhqkpzyqb1byvz9nsl54mi1bp80z5i4jq";
+ hash = "sha256-B1dIa6hNeq4iE8GKVhTp3Gzq7vp+v5Yyzj8uF8X71yg=";
};
postPatch = ''
@@ -20,6 +20,9 @@ python2Packages.buildPythonApplication rec {
done
'';
+ # Tests do not run with python3: https://github.com/lilydjwg/pssh/issues/126
+ doCheck = false;
+
meta = with lib; {
description = "Parallel SSH Tools";
longDescription = ''
diff --git a/pkgs/tools/security/fulcio/default.nix b/pkgs/tools/security/fulcio/default.nix
index 86ba5a9b3bf4..acfce66834ff 100644
--- a/pkgs/tools/security/fulcio/default.nix
+++ b/pkgs/tools/security/fulcio/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fulcio";
- version = "0.4.0";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "sigstore";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-WxSN1pZ8E5vKMoqR5EkGgKnLuHYb5Wl2vzqPcPEkXWE=";
+ sha256 = "sha256-b+2M28cI+4UkzrIqI+BioxJsGqT0pqJVPTPmXe+NsZo=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -20,7 +20,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
- vendorSha256 = "sha256-v3H+uUERDHZB2ArruCOClCQFEEW8ANeReObww+1VKOI=";
+ vendorSha256 = "sha256-INPMsSyjFs4GyapOlc/k5fcI2ePUKgp4BtASOKwQhck=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index 6825e6cbba80..4e3926d7f064 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -13,7 +13,7 @@
buildGoModule rec {
pname = "gopass";
- version = "1.14.0";
+ version = "1.14.1";
nativeBuildInputs = [ installShellFiles makeWrapper ];
@@ -21,10 +21,10 @@ buildGoModule rec {
owner = "gopasspw";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-swvZrsRuevBe8lVg67J0R9u3GB/Wc2ZR54Y6j1Bsa3E=";
+ sha256 = "sha256-vdMOD6Zrl718jcntjEzOG+4Rr0aqhm0YidA0x3Gseqg=";
};
- vendorSha256 = "sha256-Fq9jEJm65efBL5ShcB/XCM70UVDO/8STbbTOOHXrpSk=";
+ vendorSha256 = "sha256-mdPAZrcdlq7R7DRIfuxf4PCpEJoJjzo/+TDKAVglk7A=";
subPackages = [ "." ];
diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix
index 2aadf1fb7b27..1358d9f3198e 100644
--- a/pkgs/tools/security/jadx/default.nix
+++ b/pkgs/tools/security/jadx/default.nix
@@ -2,13 +2,13 @@
let
pname = "jadx";
- version = "1.3.4";
+ version = "1.3.5";
src = fetchFromGitHub {
owner = "skylot";
repo = pname;
rev = "v${version}";
- hash = "sha256-G2BgGhWk0Prbjni6HPZ/0+bWiC9uI2O13Q1SDCE5mBE=";
+ hash = "sha256-uDNHjajGqEeXOIC5SaluhHWOkA2j3LUvB6O3MHB2+YA=";
};
deps = stdenv.mkDerivation {
@@ -40,7 +40,7 @@ let
'';
outputHashMode = "recursive";
- outputHash = "sha256-QZClHuj7oCUYX3I8B3A90m4zK7+FP24C19RIzYyPC1w=";
+ outputHash = "sha256-SFj3VPCIxEA2mj/xsibXZ1MDmV/BnmvQJUBav1gfEGM=";
};
in stdenv.mkDerivation {
inherit pname version src;
diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 14e0be73f01e..90485ae817ed 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -30,11 +30,11 @@ let
in
stdenv.mkDerivation rec {
pname = "tor";
- version = "0.4.6.10";
+ version = "0.4.7.7";
src = fetchurl {
url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
- sha256 = "lMzWDgTlWPM75zAyvITqJBZg+S9Yz7iHib2miTc54xw=";
+ sha256 = "sha256-PhMRWLUrlDXX5D0cR+8oi5bQBTQsxEuMlQu0A4UaW0Q=";
};
outputs = [ "out" "geoip" ];
@@ -45,9 +45,13 @@ stdenv.mkDerivation rec {
patches = [ ./disable-monotonic-timer-tests.patch ];
- # cross compiles correctly but needs the following
- configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
- "--disable-tool-name-check";
+ configureFlags =
+ # cross compiles correctly but needs the following
+ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--disable-tool-name-check" ]
+ ++
+ # sandbox is broken on aarch64-linux https://gitlab.torproject.org/tpo/core/tor/-/issues/40599
+ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ "--disable-seccomp" ]
+ ;
NIX_CFLAGS_LINK = lib.optionalString stdenv.cc.isGNU "-lgcc_s";
diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix
index 09b7b3127994..0820869fb0d1 100644
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/pkgs/tools/system/freeipmi/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, libgcrypt, readline, libgpg-error }:
+{ buildPackages, fetchurl, lib, stdenv, libgcrypt, readline, libgpg-error }:
stdenv.mkDerivation rec {
version = "1.6.9";
@@ -9,8 +9,13 @@ stdenv.mkDerivation rec {
sha256 = "sha256-8l4cNfPQ8bWpnMMezCNTyoPtRqFRY4QvuocBJ9ycggY=";
};
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+
buildInputs = [ libgcrypt readline libgpg-error ];
+ configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform)
+ [ "ac_cv_file__dev_urandom=true" "ac_cv_file__dev_random=true" ];
+
doCheck = true;
meta = {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index cfb1ed919726..2ae688dc1b8f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -324,6 +324,7 @@ mapAliases ({
double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22
dragon-drop = throw "'dragon-drop' has been removed in favor of 'xdragon'"; # Added 2022-04-10;
draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14
+ dust = throw "dust has been removed: abandoned by upstream"; # Added 2022-04-21
dvb_apps = throw "dvb_apps has been removed"; # Added 2020-11-03
dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22
dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose"; # Added 2021-02-07
@@ -1001,6 +1002,7 @@ mapAliases ({
pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed"; # Added 2022-01-19
ping = throw "'ping' does not build with recent valac and has been removed. If you are just looking for the 'ping' command use either 'iputils' or 'inetutils'"; # Added 2022-04-18
piwik = throw "'piwik' has been renamed to/replaced by 'matomo'"; # Converted to throw 2022-02-22
+ pixie = throw "pixie has been removed: abandoned by upstream"; # Added 2022-04-21
pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18
pkgconfigUpstream = throw "'pkgconfigUpstream' has been renamed to/replaced by 'pkg-configUpstream'"; # Converted to throw 2022-02-22
planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK"; # Added 2021-02-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd271d102116..b025c14caaa4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -406,6 +406,8 @@ with pkgs;
protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc { };
+ protoc-gen-entgrpc = callPackage ../development/tools/protoc-gen-entgrpc { };
+
protoc-gen-go = callPackage ../development/tools/protoc-gen-go { };
protoc-gen-go-grpc = callPackage ../development/tools/protoc-gen-go-grpc { };
@@ -2376,6 +2378,8 @@ with pkgs;
passExtensions = recurseIntoAttrs pass.extensions;
+ pdepend = callPackage ../development/php-packages/pdepend/default.nix { };
+
platformsh = callPackage ../misc/platformsh { };
inherd-quake = callPackage ../applications/misc/inherd-quake {
@@ -14493,9 +14497,6 @@ with pkgs;
inherit (ocamlPackages) reason;
- pixie = callPackage ../development/interpreters/pixie { };
- dust = callPackage ../development/interpreters/pixie/dust.nix { };
-
buildRubyGem = callPackage ../development/ruby-modules/gem { };
defaultGemConfig = callPackage ../development/ruby-modules/gem-config {
inherit (darwin) DarwinTools cctools;
@@ -26110,6 +26111,10 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
+ firewalld = callPackage ../applications/networking/firewalld { };
+
+ firewalld-gui = firewalld.override { withGui = true; };
+
flacon = libsForQt5.callPackage ../applications/audio/flacon { };
flexget = callPackage ../applications/networking/flexget { };
@@ -30337,6 +30342,8 @@ with pkgs;
vmware-horizon-client = callPackage ../applications/networking/remote/vmware-horizon-client { };
+ vmware-workstation = callPackage ../applications/virtualization/vmware-workstation { };
+
vocproc = callPackage ../applications/audio/vocproc { };
vnstat = callPackage ../applications/networking/vnstat { };
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 9544047355f4..9743acce4b6d 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -464,6 +464,8 @@ in {
vmm_clock = callPackage ../os-specific/linux/vmm_clock { };
+ vmware = callPackage ../os-specific/linux/vmware { };
+
wireguard = if lib.versionOlder kernel.version "5.6" then callPackage ../os-specific/linux/wireguard { } else null;
x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { };
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index a5d553ac629a..3fa17b358537 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -209,6 +209,8 @@ lib.makeScope pkgs.newScope (self: with self; {
sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914";
});
+ openswoole = callPackage ../development/php-packages/openswoole { };
+
pdlib = callPackage ../development/php-packages/pdlib { };
pcov = callPackage ../development/php-packages/pcov { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1e11eb9824a9..032349a2d49f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2840,6 +2840,8 @@ in {
fastavro = callPackage ../development/python-modules/fastavro { };
+ fastbencode = callPackage ../development/python-modules/fastbencode { };
+
fastcache = callPackage ../development/python-modules/fastcache { };
fastcore = callPackage ../development/python-modules/fastcore { };
@@ -3140,6 +3142,14 @@ in {
fonttools = callPackage ../development/python-modules/fonttools { };
+ fontmake = callPackage ../development/python-modules/fontmake { };
+
+ skia-pathops = callPackage ../development/python-modules/skia-pathops { };
+
+ openstep-plist = callPackage ../development/python-modules/openstep-plist { };
+
+ glyphslib = callPackage ../development/python-modules/glyphslib { };
+
foobot-async = callPackage ../development/python-modules/foobot-async { };
foolscap = callPackage ../development/python-modules/foolscap { };
@@ -3256,6 +3266,8 @@ in {
gbinder-python = callPackage ../development/python-modules/gbinder-python { };
+ gbulb = callPackage ../development/python-modules/gbulb { };
+
gcovr = callPackage ../development/python-modules/gcovr { };
gcsfs = callPackage ../development/python-modules/gcsfs { };
@@ -5612,6 +5624,11 @@ in {
nextcord = callPackage ../development/python-modules/nextcord { };
+ nftables = toPythonModule (pkgs.nftables.override {
+ python3 = python;
+ withPython = true;
+ });
+
nghttp2 = (toPythonModule (pkgs.nghttp2.override {
inherit (self) python cython setuptools;
inherit (pkgs) ncurses;