diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 97 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 5 |
4 files changed, 77 insertions, 33 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fe77a591876f..55251c904514 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -229,6 +229,10 @@ mapAliases ({ ruby_2_5_0 = throw "deprecated 2018-0213: use ruby_2_5 instead"; rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 + s6Dns = s6-dns; # added 2018-07-23 + s6Networking = s6-networking; # added 2018-07-23 + s6LinuxUtils = s6-linux-utils; # added 2018-07-23 + s6PortableUtils = s6-portable-utils; # added 2018-07-23 sam = deadpixi-sam; # added 2018-04-25 samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 saneBackends = sane-backends; # added 2016-01-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f707f98d4a0e..8a1746a21e5e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22,6 +22,22 @@ with pkgs; stdenvNoCC = stdenv.override { cc = null; }; + stdenvNoLibs = let + bintools = stdenv.cc.bintools.override { + libc = null; + noLibc = true; + }; + in stdenv.override { + cc = stdenv.cc.override { + libc = null; + noLibc = true; + extraPackages = []; + inherit bintools; + }; + allowedRequisites = + lib.mapNullable (rs: rs ++ [ bintools ]) (stdenv.allowedRequisites or null); + }; + # For convenience, allow callers to get the path to Nixpkgs. path = ../..; @@ -168,6 +184,8 @@ with pkgs; packer = callPackage ../development/tools/packer { }; + pet = callPackage ../development/tools/pet { }; + mht2htm = callPackage ../tools/misc/mht2htm { }; fetchpatch = callPackage ../build-support/fetchpatch { }; @@ -676,6 +694,8 @@ with pkgs; browserpass = callPackage ../tools/security/browserpass { }; + passff-host = callPackage ../tools/security/passff-host { }; + oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { }; kwakd = callPackage ../servers/kwakd { }; @@ -858,7 +878,12 @@ with pkgs; tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; - libtensorflow = callPackage ../development/libraries/libtensorflow { }; + libtensorflow = callPackage ../development/libraries/libtensorflow { + cudaSupport = config.cudaSupport or false; + inherit (linuxPackages) nvidia_x11; + cudatoolkit = cudatoolkit_9_0; + cudnn = cudnn_cudatoolkit_9_0; + }; blink1-tool = callPackage ../tools/misc/blink1-tool { }; @@ -1417,6 +1442,8 @@ with pkgs; s2png = callPackage ../tools/graphics/s2png { }; + simg2img = callPackage ../tools/filesystems/simg2img { }; + socklog = callPackage ../tools/system/socklog { }; staccato = callPackage ../tools/text/staccato { }; @@ -4910,6 +4937,8 @@ with pkgs; rubocop = callPackage ../development/tools/rubocop { }; + runelite = callPackage ../games/runelite { }; + runningx = callPackage ../tools/X11/runningx { }; runzip = callPackage ../tools/archivers/runzip { }; @@ -4932,13 +4961,13 @@ with pkgs; s3gof3r = callPackage ../tools/networking/s3gof3r { }; - s6Dns = callPackage ../tools/networking/s6-dns { }; + s6-dns = callPackage ../tools/networking/s6-dns { }; - s6LinuxUtils = callPackage ../os-specific/linux/s6-linux-utils { }; + s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { }; - s6Networking = callPackage ../tools/networking/s6-networking { }; + s6-networking = callPackage ../tools/networking/s6-networking { }; - s6PortableUtils = callPackage ../tools/misc/s6-portable-utils { }; + s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { }; sablotron = callPackage ../tools/text/xml/sablotron { }; @@ -6327,13 +6356,7 @@ with pkgs; { substitutions = { gcc = gcc-unwrapped; }; } ../development/compilers/gcc/libstdc++-hook.sh; - # Can't just overrideCC, because then the stdenv-cross mkDerivation will be - # thrown away. TODO: find a better solution for this. - crossLibcStdenv = buildPackages.makeStdenvCross { - inherit (buildPackages.buildPackages) stdenv; - inherit buildPlatform hostPlatform targetPlatform; - cc = buildPackages.gccCrossStageStatic; - }; + crossLibcStdenv = overrideCC stdenv buildPackages.gccCrossStageStatic; # The GCC used to build libc for the target platform. Normal gccs will be # built with, and use, that cross-compiled libc. @@ -8004,7 +8027,9 @@ with pkgs; librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { }; - libstdcxx5 = callPackage ../development/libraries/libstdc++5 { }; + libgcc = callPackage ../development/libraries/gcc/libgcc { }; + + libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { }; libsigrok = callPackage ../development/tools/libsigrok { }; # old version: @@ -8263,6 +8288,8 @@ with pkgs; kube-aws = callPackage ../development/tools/kube-aws { }; + kustomize = callPackage ../development/tools/kustomize { }; + Literate = callPackage ../development/tools/literate-programming/Literate {}; lcov = callPackage ../development/tools/analysis/lcov { }; @@ -8831,7 +8858,11 @@ with pkgs; c-blosc = callPackage ../development/libraries/c-blosc { }; - cachix = haskell.lib.justStaticExecutables haskellPackages.cachix; + cachix = (haskell.lib.justStaticExecutables haskellPackages.cachix).overrideAttrs (drv: { + meta = drv.meta // { + hydraPlatforms = stdenv.lib.platforms.unix; + }; + }); capnproto = callPackage ../development/libraries/capnproto { }; @@ -8980,6 +9011,8 @@ with pkgs; db60 = callPackage ../development/libraries/db/db-6.0.nix { }; db62 = callPackage ../development/libraries/db/db-6.2.nix { }; + dbxml = callPackage ../development/libraries/dbxml { }; + dbus = callPackage ../development/libraries/dbus { }; dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; dbus-glib = callPackage ../development/libraries/dbus-glib { }; @@ -10333,6 +10366,8 @@ with pkgs; libmypaint = callPackage ../development/libraries/libmypaint { }; + libmysofa = callPackage ../development/libraries/audio/libmysofa { }; + libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp { mysql = mysql57; }; @@ -11686,6 +11721,8 @@ with pkgs; ronn = callPackage ../development/tools/ronn { }; + rshell = python3.pkgs.callPackage ../development/tools/rshell { }; + rubberband = callPackage ../development/libraries/rubberband { inherit (vamp) vampSDK; }; @@ -11828,6 +11865,8 @@ with pkgs; sofia_sip = callPackage ../development/libraries/sofia-sip { }; + soil = callPackage ../development/libraries/soil { }; + sonic = callPackage ../development/libraries/sonic { }; soprano = callPackage ../development/libraries/soprano { }; @@ -13771,11 +13810,6 @@ with pkgs; # kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long kernelPatches.bcm2835_mmal_v4l2_camera_driver # Only needed for 4.16! - # https://github.com/NixOS/nixpkgs/issues/42755 - # Remove these xen-netfront patches once they're included in - # upstream! Fixes https://github.com/NixOS/nixpkgs/issues/42755 - kernelPatches.xen-netfront_fix_mismatched_rtnl_unlock - kernelPatches.xen-netfront_update_features_after_registering_netdev ]; }; @@ -15389,10 +15423,7 @@ with pkgs; openjpeg = openjpeg_1; }; - perkeep = callPackage ../applications/misc/perkeep { - # Perkeep is very particular about which go version to build with. - go = go_1_9; - }; + perkeep = callPackage ../applications/misc/perkeep { }; canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; @@ -15642,6 +15673,8 @@ with pkgs; docker-distribution = callPackage ../applications/virtualization/docker/distribution.nix { }; + amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { }; + docker-credential-gcr = callPackage ../tools/admin/docker-credential-gcr { }; doodle = callPackage ../applications/search/doodle { }; @@ -16945,6 +16978,8 @@ with pkgs; kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; + kubetail = callPackage ../applications/networking/cluster/kubetail { } ; + kupfer = callPackage ../applications/misc/kupfer { }; lame = callPackage ../development/libraries/lame { }; @@ -18685,12 +18720,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData; inherit (darwin) libobjc cf-private; inherit lua; - - features = "huge"; # one of tiny, small, normal, big or huge - gui = config.vim.gui or "auto"; - - # optional features by flags - flags = [ "python" "X11" ]; # only flag "X11" by now }); vimNox = lowPrio (vim_configurable.override { @@ -19350,6 +19379,8 @@ with pkgs; armagetronad = callPackage ../games/armagetronad { }; + arena = callPackage ../games/arena {}; + arx-libertatis = callPackage ../games/arx-libertatis { stdenv = overrideCC stdenv gcc6; }; @@ -19657,9 +19688,7 @@ with pkgs; megaglest = callPackage ../games/megaglest {}; - minecraft = callPackage ../games/minecraft { - useAlsa = config.minecraft.alsa or false; - }; + minecraft = callPackage ../games/minecraft { }; minecraft-server = callPackage ../games/minecraft-server { }; @@ -20911,6 +20940,8 @@ with pkgs; spyder = callPackage ../applications/science/spyder { }; + openspace = callPackage ../applications/science/astronomy/openspace { }; + stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { }; tulip = callPackage ../applications/science/misc/tulip { @@ -21799,6 +21830,8 @@ with pkgs; yara = callPackage ../tools/security/yara { }; + yaxg = callPackage ../tools/graphics/yaxg {}; + zap = callPackage ../tools/networking/zap { }; zdfmediathk = callPackage ../applications/video/zdfmediathk { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index eb76c323dde4..9bfb2f97c6e4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -640,6 +640,8 @@ let ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {}; + ppx_gen_rec = callPackage ../development/ocaml-modules/ppx_gen_rec {}; + ppx_import = callPackage ../development/ocaml-modules/ppx_import {}; ppx_tools = @@ -1067,7 +1069,7 @@ in rec ocamlPackages_4_07 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.07.nix { }) (self: super: { }); - ocamlPackages_latest = ocamlPackages_4_06; + ocamlPackages_latest = ocamlPackages_4_07; ocamlPackages = # OCaml 4.05 is broken on aarch64 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b8ccafc3ad7c..80f7a6d43598 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -573,6 +573,11 @@ in { appdirs = callPackage ../development/python-modules/appdirs { }; + appleseed = disabledIf isPy3k + (toPythonModule (pkgs.appleseed.override { + inherit (self) python; + })); + application = callPackage ../development/python-modules/application { }; appnope = callPackage ../development/python-modules/appnope { }; |