diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-16 18:01:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-16 18:01:12 +0000 |
| commit | 164a7e44c7deffc1a73b7b399c1aace017b1ea7b (patch) | |
| tree | 68caf1a2ec4bb090b4a71ab66d23287f630d0899 /pkgs/top-level | |
| parent | 5c852cc5876900f7b15a49bd3e7395e676f54d86 (diff) | |
| parent | ac1f5b72a9e95873d1de0233fddcb56f99884b37 (diff) | |
| download | nixpkgs-164a7e44c7deffc1a73b7b399c1aace017b1ea7b.tar nixpkgs-164a7e44c7deffc1a73b7b399c1aace017b1ea7b.tar.gz nixpkgs-164a7e44c7deffc1a73b7b399c1aace017b1ea7b.tar.bz2 nixpkgs-164a7e44c7deffc1a73b7b399c1aace017b1ea7b.tar.lz nixpkgs-164a7e44c7deffc1a73b7b399c1aace017b1ea7b.tar.xz nixpkgs-164a7e44c7deffc1a73b7b399c1aace017b1ea7b.tar.zst nixpkgs-164a7e44c7deffc1a73b7b399c1aace017b1ea7b.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 703a58e9f32..6564dd7a449 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1276,6 +1276,7 @@ mapAliases ({ pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire"; # Added 2021-02-13 pulseeffects-pw = easyeffects; # Added 2021-07-07 pyls-black = throw "pyls-black has been removed from nixpkgs. Use python-lsp-black instead."; # Added 2023-01-09 + pyls-mypy = throw "pyls-mypy has been removed from nixpkgs. Use pylsp-mypy instead."; # Added 2023-01-09 py-wmi-client = throw "py-wmi-client has been removed: abandoned by upstream"; # Added 2022-04-26 pydb = throw "pydb has been removed: abandoned by upstream"; # Added 2022-04-22 pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4aa903afe19..ac47fcee974 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5407,8 +5407,9 @@ with pkgs; proxmox-backup-client = callPackage ../applications/backup/proxmox-backup-client { }; - pueue = callPackage ../applications/misc/pueue { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + pueue = darwin.apple_sdk_11_0.callPackage ../applications/misc/pueue { + inherit (darwin.apple_sdk_11_0) Libsystem; + inherit (darwin.apple_sdk_11_0.frameworks) SystemConfiguration; }; pixcat = with python3Packages; toPythonApplication pixcat; @@ -12776,6 +12777,8 @@ with pkgs; ipbt = callPackage ../tools/misc/ipbt { }; + tuckr = callPackage ../applications/misc/tuckr { }; + tuhi = callPackage ../applications/misc/tuhi { }; tuir = callPackage ../applications/misc/tuir { }; @@ -16936,9 +16939,7 @@ with pkgs; srelay = callPackage ../tools/networking/srelay { }; - xidel = callPackage ../tools/text/xidel { - openssl = openssl_1_1; - }; + xidel = callPackage ../tools/text/xidel { }; asdf-vm = callPackage ../tools/misc/asdf-vm { }; @@ -26227,8 +26228,8 @@ with pkgs; nsh = callPackage ../shells/nsh { }; nushell = darwin.apple_sdk_11_0.callPackage ../shells/nushell { + inherit (darwin.apple_sdk_11_0) Libsystem; inherit (darwin.apple_sdk_11_0.frameworks) AppKit Security; - inherit (darwin.apple_sdk) sdk; }; nettools = if stdenv.isLinux diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 22f1620332f..8272597e28a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8319,8 +8319,6 @@ self: super: with self; { pyls-isort = callPackage ../development/python-modules/pyls-isort { }; - pyls-mypy = callPackage ../development/python-modules/pyls-mypy { }; - pyls-spyder = callPackage ../development/python-modules/pyls-spyder { }; pylsp-mypy = callPackage ../development/python-modules/pylsp-mypy { }; |