diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-11 12:01:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-11 12:01:23 +0000 |
| commit | 6ac7b9234ad8762539fd492b295ec7b1d847570f (patch) | |
| tree | de14ab0dd331e3e8d89eaa18711d085ea217609a /pkgs/top-level | |
| parent | 1e3b05e37fcf4048fdefa0a9971e3b598c89626a (diff) | |
| parent | 306b3a15bcab67a598ff4a97c319bdc736930310 (diff) | |
| download | nixlib-6ac7b9234ad8762539fd492b295ec7b1d847570f.tar nixlib-6ac7b9234ad8762539fd492b295ec7b1d847570f.tar.gz nixlib-6ac7b9234ad8762539fd492b295ec7b1d847570f.tar.bz2 nixlib-6ac7b9234ad8762539fd492b295ec7b1d847570f.tar.lz nixlib-6ac7b9234ad8762539fd492b295ec7b1d847570f.tar.xz nixlib-6ac7b9234ad8762539fd492b295ec7b1d847570f.tar.zst nixlib-6ac7b9234ad8762539fd492b295ec7b1d847570f.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f768ef41cfd1..90cccd1fb9b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6117,8 +6117,6 @@ with pkgs; nfstrace = callPackage ../tools/networking/nfstrace { }; - nix-direnv = callPackage ../tools/misc/nix-direnv { }; - nixel = callPackage ../tools/nix/nixel { }; nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index d418686925d8..c424226f76b9 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -476,6 +476,7 @@ lib.makeScope pkgs.newScope (self: with self; { lib.optional (!stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind) valgrind.dev; + configureFlags = lib.optional php.ztsSupport "--disable-opcache-jit"; zendExtension = true; postPatch = lib.optionalString stdenv.isDarwin '' # Tests are flaky on darwin diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c8d4d8301c0..19ea0e6cdab5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -955,6 +955,8 @@ self: super: with self; { avea = callPackage ../development/python-modules/avea { }; + avidtools = callPackage ../development/python-modules/avidtools { }; + avion = callPackage ../development/python-modules/avion { }; avro3k = callPackage ../development/python-modules/avro3k { }; @@ -8424,6 +8426,8 @@ self: super: with self; { nvchecker = callPackage ../development/python-modules/nvchecker { }; + nvdlib = callPackage ../development/python-modules/nvdlib { }; + nvidia-ml-py = callPackage ../development/python-modules/nvidia-ml-py { }; nsz = callPackage ../development/python-modules/nsz { }; @@ -16205,6 +16209,8 @@ self: super: with self; { youseedee = callPackage ../development/python-modules/youseedee { }; + youtokentome = callPackage ../development/python-modules/youtokentome { }; + youtube-dl = callPackage ../tools/misc/youtube-dl { }; youtube-dl-light = callPackage ../tools/misc/youtube-dl { |