diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 72 |
1 files changed, 31 insertions, 41 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 057f878dedc..8c322e0bc8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1141,6 +1141,8 @@ with pkgs; masscan = callPackage ../tools/security/masscan { }; + meritous = callPackage ../games/meritous { }; + meson = callPackage ../development/tools/build-managers/meson { }; mp3fs = callPackage ../tools/filesystems/mp3fs { }; @@ -1398,7 +1400,13 @@ with pkgs; ciopfs = callPackage ../tools/filesystems/ciopfs { }; - citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { }; + # Use Citrix Receiver 13.4.0 below if you get "A network error occured (SSL error 4)" + # See https://discussions.citrix.com/topic/385459-ssl-error-with-135-works-with-134/?p=1977735 + citrix_receiver = hiPrio citrix_receiver_13_7_0; + citrix_receiver_13_7_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.7.0"; }; + citrix_receiver_13_6_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.6.0"; }; + citrix_receiver_13_5_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.5.0"; }; + citrix_receiver_13_4_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.4.0"; }; citra = libsForQt5.callPackage ../misc/emulators/citra { }; @@ -2719,6 +2727,8 @@ with pkgs; ipfs = callPackage ../applications/networking/ipfs { }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; + ipget = callPackage ../applications/networking/ipget { }; + ipmitool = callPackage ../tools/system/ipmitool { static = false; }; @@ -5410,6 +5420,8 @@ with pkgs; clang-sierraHack-stdenv = overrideCC stdenv clang-sierraHack; libcxxStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv; + clasp-common-lisp = callPackage ../development/compilers/clasp {}; + clean = callPackage ../development/compilers/clean { }; closurecompiler = callPackage ../development/compilers/closure { }; @@ -6175,33 +6187,9 @@ with pkgs; inherit (darwin) apple_sdk; }; - rustRegistry = callPackage ./rust-packages.nix { }; - - rust = rustStable; - rustStable = callPackage ../development/compilers/rust { - inherit (llvmPackages_4) llvm; - }; - rustBeta = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/beta.nix {})); - - rustNightly = rustBeta; - - # rust support in nixpkgs isn't yet well maintained enough for us to - # pretend to support nightlies in a meaningful way. - - # rustNightly = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/nightly.nix { - # rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta); - # })); - - rustNightlyBin = lowPrio (callPackage ../development/compilers/rust/nightlyBin.nix { - buildRustPackage = callPackage ../build-support/rust { - rust = rustNightlyBin; - }; - }); - - cargo = rust.cargo; - rustc = rust.rustc; - - cargo-edit = callPackage ../tools/package-management/cargo-edit { }; + # For beta and nightly releases use the nixpkgs-mozilla overlay + rust = callPackage ../development/compilers/rust { }; + inherit (rust) cargo rustc; rustPlatform = recurseIntoAttrs (makeRustPlatform rust); @@ -6224,6 +6212,8 @@ with pkgs; }); + cargo-edit = callPackage ../tools/package-management/cargo-edit { }; + rainicorn = callPackage ../development/tools/rust/rainicorn { }; rustfmt = callPackage ../development/tools/rust/rustfmt { }; rustracer = callPackage ../development/tools/rust/racer { }; @@ -7355,7 +7345,7 @@ with pkgs; lttv = callPackage ../development/tools/misc/lttv { }; - massif-visualizer = kde4.callPackage ../development/tools/analysis/massif-visualizer { }; + massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; maven = maven3; maven3 = callPackage ../development/tools/build-managers/apache-maven { }; @@ -7769,7 +7759,9 @@ with pkgs; aspellDicts = recurseIntoAttrs (callPackages ../development/libraries/aspell/dictionaries.nix {}); - aspellWithDicts = callPackage ../development/libraries/aspell/aspell-with-dicts.nix { }; + aspellWithDicts = callPackage ../development/libraries/aspell/aspell-with-dicts.nix { + aspell = aspell.override { searchNixProfiles = false; }; + }; attica = callPackage ../development/libraries/attica { }; @@ -7826,7 +7818,6 @@ with pkgs; botan = callPackage ../development/libraries/botan { }; botan2 = callPackage ../development/libraries/botan/2.0.nix { }; - botanUnstable = callPackage ../development/libraries/botan/unstable.nix { }; box2d = callPackage ../development/libraries/box2d { }; @@ -8110,14 +8101,14 @@ with pkgs; ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - ffmpeg_3_3 = callPackage ../development/libraries/ffmpeg/3.3.nix { + ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; }; # Aliases ffmpeg_0 = ffmpeg_0_10; ffmpeg_1 = ffmpeg_1_2; ffmpeg_2 = ffmpeg_2_8; - ffmpeg_3 = ffmpeg_3_3; + ffmpeg_3 = ffmpeg_3_4; ffmpeg = ffmpeg_3; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { @@ -8620,6 +8611,9 @@ with pkgs; withIcu = true; withGraphite2 = true; }; + harfbuzz-icu-58 = harfbuzz-icu.override { + icu = icu58; + }; hawknl = callPackage ../development/libraries/hawknl { }; @@ -10951,7 +10945,7 @@ with pkgs; webkitgtk = webkitgtk218x; webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix { - harfbuzz = harfbuzz-icu; + harfbuzz = harfbuzz-icu-58; gst-plugins-base = gst_all_1.gst-plugins-base; inherit (darwin) libobjc; }; @@ -10961,11 +10955,6 @@ with pkgs; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; }; - webkitgtk217x = callPackage ../development/libraries/webkitgtk/2.17.nix { - harfbuzz = harfbuzz-icu; - gst-plugins-base = gst_all_1.gst-plugins-base; - }; - webkitgtk24x-gtk2 = webkitgtk24x-gtk3.override { withGtk2 = true; enableIntrospection = false; @@ -15253,7 +15242,7 @@ with pkgs; akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole - kontact korganizer krfb kwalletmanager marble okteta okular spectacle; + kontact korganizer krdc krfb kwalletmanager marble minuet okteta okular spectacle; kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; @@ -18544,7 +18533,7 @@ with pkgs; }; coq_8_6 = callPackage ../applications/science/logic/coq {}; coq_8_7 = callPackage ../applications/science/logic/coq { - version = "8.7+beta2"; + version = "8.7.0"; }; coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {}; @@ -18604,6 +18593,7 @@ with pkgs; coqPackages_8_4 = mkCoqPackages_8_4 coqPackages_8_4; coqPackages_8_5 = mkCoqPackages coqPackages_8_5 coq_8_5; coqPackages_8_6 = mkCoqPackages coqPackages_8_6 coq_8_6; + coqPackages_8_7 = mkCoqPackages coqPackages_8_7 coq_8_7; coqPackages = coqPackages_8_6; coq = coqPackages.coq; |