diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2021-12-27 15:34:06 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2021-12-27 15:34:06 +0100 |
| commit | 44f52594d1a0dda1848f227b34a0b088dcb1e11d (patch) | |
| tree | 7b9ed0fa85a40f62a3ef12045c442c5200413fb3 /pkgs/top-level | |
| parent | 7ef0a91a4d6d1e7162857eecc7faea5fa65095fd (diff) | |
| parent | faa2652e689a7a5ccc63a5583843a8b59bc8c982 (diff) | |
| download | nixpkgs-44f52594d1a0dda1848f227b34a0b088dcb1e11d.tar nixpkgs-44f52594d1a0dda1848f227b34a0b088dcb1e11d.tar.gz nixpkgs-44f52594d1a0dda1848f227b34a0b088dcb1e11d.tar.bz2 nixpkgs-44f52594d1a0dda1848f227b34a0b088dcb1e11d.tar.lz nixpkgs-44f52594d1a0dda1848f227b34a0b088dcb1e11d.tar.xz nixpkgs-44f52594d1a0dda1848f227b34a0b088dcb1e11d.tar.zst nixpkgs-44f52594d1a0dda1848f227b34a0b088dcb1e11d.zip | |
Merge remote-tracking branch 'origin/master' into haskell-updates
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55a480c1cd7..bcf00c88b88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -186,7 +186,7 @@ with pkgs; antsimulator = callPackage ../games/antsimulator { }; - aocd = with pythonPackages; toPythonApplication aocd; + aocd = with python3Packages; toPythonApplication aocd; astrolog = callPackage ../applications/science/astronomy/astrolog { }; @@ -2990,6 +2990,10 @@ with pkgs; fast-cpp-csv-parser = callPackage ../development/libraries/fast-cpp-csv-parser { }; + fast-ssh = callPackage ../tools/networking/fast-ssh { + inherit (darwin.apple_sdk.frameworks) Security; + }; + faudio = callPackage ../development/libraries/faudio { }; fd = callPackage ../tools/misc/fd { }; @@ -10264,6 +10268,8 @@ with pkgs; touchegg = callPackage ../tools/inputmethods/touchegg { }; + torrent7z = callPackage ../tools/archivers/torrent7z { }; + torsocks = callPackage ../tools/security/tor/torsocks.nix { }; toss = callPackage ../tools/networking/toss { }; @@ -30681,6 +30687,8 @@ with pkgs; naev = callPackage ../games/naev { }; + nanosaur = callPackage ../games/nanosaur { }; + nethack = callPackage ../games/nethack { }; nethack-qt = callPackage ../games/nethack { |