diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-05 07:56:07 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-05 08:02:48 +0000 |
| commit | a838aa244f52fcf9325e4d41d89a69ce900b09d0 (patch) | |
| tree | 9dbc24eb67c5fdb217cb1bea2c97fbfdc98e9c95 /pkgs/servers/x11 | |
| parent | 894baab1654685f6420df497c62ad7015d636931 (diff) | |
| parent | d579416a56656f914412897973755d5b9908979b (diff) | |
| download | nixlib-a838aa244f52fcf9325e4d41d89a69ce900b09d0.tar nixlib-a838aa244f52fcf9325e4d41d89a69ce900b09d0.tar.gz nixlib-a838aa244f52fcf9325e4d41d89a69ce900b09d0.tar.bz2 nixlib-a838aa244f52fcf9325e4d41d89a69ce900b09d0.tar.lz nixlib-a838aa244f52fcf9325e4d41d89a69ce900b09d0.tar.xz nixlib-a838aa244f52fcf9325e4d41d89a69ce900b09d0.tar.zst nixlib-a838aa244f52fcf9325e4d41d89a69ce900b09d0.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
The hash for pytensor is not correct, but that's also the case in master, so a merge commit isn't the place to fix it. Conflicts: pkgs/development/python-modules/faadelays/default.nix pkgs/development/python-modules/pytensor/default.nix pkgs/tools/admin/rset/default.nix
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xquartz/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index cdb2122a612d..93b2869f8d2b 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -177,7 +177,7 @@ in stdenv.mkDerivation { meta = with lib; { platforms = platforms.darwin; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; license = licenses.mit; }; } |