diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-15 02:01:03 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-15 02:01:15 +0100 |
| commit | 3b8cf433506453cfccd255021e1e52882daf4097 (patch) | |
| tree | f32ae1e138468e138615eec0f21f64c10e0742f4 /pkgs/top-level | |
| parent | 231c1145f23b9e7e4477cf280212b92f46698717 (diff) | |
| parent | 1c03223e5c1cf29a349a47ddf76f14806c048852 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/python-modules/imageio/default.nix - pkgs/development/python-modules/pytest-order/default.nix
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4aa82d43ea543..abba5efac4a9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26830,8 +26830,6 @@ with pkgs; # Building with `xen` instead of `xen-slim` is possible, but makes no sense. qemu_xen = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-slim; }); qemu_xen-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-light; }); - qemu_xen_4_10 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_10-slim; }); - qemu_xen_4_10-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_10-light; }); qemu_xen_4_15 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_15-slim; }); qemu_xen_4_15-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_15-light; }); @@ -29949,9 +29947,7 @@ with pkgs; fbida = callPackage ../applications/graphics/fbida { }; - fclones = callPackage ../tools/misc/fclones { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; + fclones = callPackage ../tools/misc/fclones { }; fcp = callPackage ../tools/misc/fcp { }; @@ -34537,10 +34533,6 @@ with pkgs; xen-slim = xenPackages.xen-slim; xen-light = xenPackages.xen-light; - xen_4_10 = xenPackages.xen_4_10-vanilla; - xen_4_10-slim = xenPackages.xen_4_10-slim; - xen_4_10-light = xenPackages.xen_4_10-light; - xen_4_15 = xenPackages.xen_4_15-vanilla; xen_4_15-slim = xenPackages.xen_4_15-slim; xen_4_15-light = xenPackages.xen_4_15-light; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b3f6c560d657a..90f28e21ef9db 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6097,6 +6097,8 @@ self: super: with self; { mock-services = callPackage ../development/python-modules/mock-services { }; + mock-ssh-server = callPackage ../development/python-modules/mock-ssh-server { }; + mockupdb = callPackage ../development/python-modules/mockupdb { }; modeled = callPackage ../development/python-modules/modeled { }; @@ -11207,6 +11209,8 @@ self: super: with self; { ssh-mitm = callPackage ../development/python-modules/ssh-mitm { }; + sshfs = callPackage ../development/python-modules/sshfs { }; + sshpubkeys = callPackage ../development/python-modules/sshpubkeys { }; sshtunnel = callPackage ../development/python-modules/sshtunnel { }; |