diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a744d039b41f..3c7aa60a14d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7273,11 +7273,9 @@ with pkgs; curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; - curl-impersonate = - builtins.mapAttrs (_: pin-to-gcc12-if-gcc13) - (darwin.apple_sdk_11_0.callPackage ../tools/networking/curl-impersonate { }); - curl-impersonate-ff = pin-to-gcc12-if-gcc13 curl-impersonate.curl-impersonate-ff; - curl-impersonate-chrome = pin-to-gcc12-if-gcc13 curl-impersonate.curl-impersonate-chrome; + curl-impersonate = darwin.apple_sdk_11_0.callPackage ../tools/networking/curl-impersonate { }; + curl-impersonate-ff = curl-impersonate.curl-impersonate-ff; + curl-impersonate-chrome = curl-impersonate.curl-impersonate-chrome; curlie = callPackage ../tools/networking/curlie { }; @@ -10598,7 +10596,9 @@ with pkgs; lxcfs = callPackage ../os-specific/linux/lxcfs { }; lxd = callPackage ../tools/admin/lxd/wrapper.nix { }; - lxd-unwrapped = callPackage ../tools/admin/lxd { }; + lxd-unwrapped = callPackage ../tools/admin/lxd { + buildGoModule = buildGo122Module; + }; lxd-image-server = callPackage ../tools/virtualization/lxd-image-server { }; @@ -10892,7 +10892,7 @@ with pkgs; metasploit = callPackage ../tools/security/metasploit { }; mhost = callPackage ../applications/networking/mhost { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; ms-sys = callPackage ../tools/misc/ms-sys { }; @@ -17089,10 +17089,6 @@ with pkgs; stalin = callPackage ../development/compilers/stalin { }; - stanc = callPackage ../development/compilers/stanc { - ocamlPackages = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; - }; - metaBuildEnv = callPackage ../development/compilers/meta-environment/meta-build-env { }; svd2rust = callPackage ../development/tools/rust/svd2rust { }; |