diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-16 12:01:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-16 12:01:36 +0000 |
| commit | 5c852cc5876900f7b15a49bd3e7395e676f54d86 (patch) | |
| tree | ac9439a84bc95017a1f5b79bdd1ff73baea95321 /pkgs/top-level | |
| parent | f38c4cce4a2295242862da3e85f8da46bf819415 (diff) | |
| parent | 2c82bea1a61f266bbaf1676c1fc59bbb49aa3f83 (diff) | |
| download | nixpkgs-5c852cc5876900f7b15a49bd3e7395e676f54d86.tar nixpkgs-5c852cc5876900f7b15a49bd3e7395e676f54d86.tar.gz nixpkgs-5c852cc5876900f7b15a49bd3e7395e676f54d86.tar.bz2 nixpkgs-5c852cc5876900f7b15a49bd3e7395e676f54d86.tar.lz nixpkgs-5c852cc5876900f7b15a49bd3e7395e676f54d86.tar.xz nixpkgs-5c852cc5876900f7b15a49bd3e7395e676f54d86.tar.zst nixpkgs-5c852cc5876900f7b15a49bd3e7395e676f54d86.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f81fe96e8b..4aa903afe19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11660,7 +11660,7 @@ with pkgs; s3bro = callPackage ../tools/admin/s3bro { }; - s3fs = callPackage ../tools/filesystems/s3fs { }; + s3fs = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/s3fs { }; s3cmd = python3Packages.callPackage ../tools/networking/s3cmd { }; @@ -19721,6 +19721,8 @@ with pkgs; funambol = callPackage ../development/libraries/funambol { }; + function-runner = callPackage ../development/web/function-runner { }; + functionalplus = callPackage ../development/libraries/functionalplus { }; galer = callPackage ../tools/security/galer { }; |