diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b4a208c1c92c..1b88233d08263 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13124,18 +13124,18 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_58 = callPackage ../development/compilers/rust/1_58.nix { + rust_1_59 = callPackage ../development/compilers/rust/1_59.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_13 = llvmPackages_13.libllvm; }; - rust = rust_1_58; + rust = rust_1_59; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { }; - rustPackages_1_58 = rust_1_58.packages.stable; - rustPackages = rustPackages_1_58; + rustPackages_1_59 = rust_1_59.packages.stable; + rustPackages = rustPackages_1_59; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -16979,7 +16979,7 @@ with pkgs; gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { }; gmp6 = callPackage ../development/libraries/gmp/6.x.nix { }; gmp = gmp6; - gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; }); + gmpxx = gmp.override { cxx = true; }; #GMP ex-satellite, so better keep it near gmp mpfr = callPackage ../development/libraries/mpfr { }; @@ -18772,7 +18772,7 @@ with pkgs; libusb1 = callPackage ../development/libraries/libusb1 { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) IOKit; + inherit (darwin.apple_sdk.frameworks) IOKit Security; # TODO: remove once `udev` is `systemdMinimal` everywhere. udev = systemdMinimal; }; @@ -20572,9 +20572,15 @@ with pkgs; wxGTK30-gtk2 = wxGTK30.override { withGtk2 = true; }; wxGTK30-gtk3 = wxGTK30.override { withGtk2 = false; }; - wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix { }; + wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix { + inherit (darwin.stubs) derez rez setfile; + inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit; + }; - wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix { }; + wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix { + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; + }; wxGTK31-gtk2 = wxGTK31.override { withGtk2 = true; }; wxGTK31-gtk3 = wxGTK31.override { withGtk2 = false; }; @@ -26004,9 +26010,7 @@ with pkgs; }; # Git with SVN support, but without GUI. - gitSVN = lowPrio (appendToName "with-svn" (git.override { - svnSupport = true; - })); + gitSVN = lowPrio (git.override { svnSupport = true; }); git-doc = lib.addMetaAttrs { description = "Additional documentation for Git"; @@ -26016,11 +26020,11 @@ with pkgs; ''; } gitFull.doc; - gitMinimal = appendToName "minimal" (git.override { + gitMinimal = git.override { withManual = false; pythonSupport = false; withpcre2 = false; - }); + }; gitRepo = callPackage ../applications/version-management/git-repo { }; @@ -30203,10 +30207,6 @@ with pkgs; zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; }; - zeroc-ice-36 = callPackage ../development/libraries/zeroc-ice/3.6.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; - zeronet = callPackage ../applications/networking/p2p/zeronet { }; zexy = callPackage ../applications/audio/pd-plugins/zexy { @@ -33128,10 +33128,10 @@ with pkgs; ghostscript = callPackage ../misc/ghostscript { }; - ghostscriptX = appendToName "with-X" (ghostscript.override { + ghostscriptX = ghostscript.override { cupsSupport = true; x11Support = true; - }); + }; glava = callPackage ../applications/misc/glava {}; |