diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f51bcb00eee..0a2b92cf390 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8595,8 +8595,6 @@ in vala_0_46 vala; - valadoc = callPackage ../development/tools/valadoc { }; - wcc = callPackage ../development/compilers/wcc { }; wla-dx = callPackage ../development/compilers/wla-dx { }; @@ -11248,6 +11246,7 @@ in gnutls = callPackage ../development/libraries/gnutls/default.nix { inherit (darwin.apple_sdk.frameworks) Security; + utillinux = utillinuxMinimal; # break the cyclic dependency }; gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix { @@ -12823,8 +12822,7 @@ in }; mesa = callPackage ../development/libraries/mesa { - # 7 is the default, but only on Linux, so keep this for now - llvmPackages = llvmPackages_7; + llvmPackages = llvmPackages_9; inherit (darwin.apple_sdk.frameworks) OpenGL; inherit (darwin.apple_sdk.libs) Xplugin; }; @@ -15181,6 +15179,7 @@ in postgresql_9_6 postgresql_10 postgresql_11 + postgresql_12 ; postgresql = postgresql_11.override { this = postgresql; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; |