diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fcb95c3e8d7..89f6f084fd8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1636,7 +1636,7 @@ with pkgs; emscripten = callPackage ../development/compilers/emscripten { }; emscriptenfastcomp-unwrapped = callPackage ../development/compilers/emscripten-fastcomp { }; - emscriptenfastcomp-wrapped = wrapCCWith ccWrapperFun stdenv.cc.libc '' + emscriptenfastcomp-wrapped = wrapCCWith stdenv.cc.libc '' # hardening flags break WASM support cat > $out/nix-support/add-hardening.sh '' emscriptenfastcomp-unwrapped; @@ -3378,6 +3378,8 @@ with pkgs; paper-gtk-theme = callPackage ../misc/themes/paper { }; paperwork = callPackage ../applications/office/paperwork { }; + + papertrail = callPackage ../tools/text/papertrail { }; par2cmdline = callPackage ../tools/networking/par2cmdline { }; @@ -3690,6 +3692,8 @@ with pkgs; radarr = callPackage ../servers/radarr { }; + radeon-profile = libsForQt5.callPackage ../tools/misc/radeon-profile { }; + radvd = callPackage ../tools/networking/radvd { }; rambox = callPackage ../applications/networking/instant-messengers/rambox { }; @@ -4885,7 +4889,7 @@ with pkgs; clangSelf = clangWrapSelf llvmPackagesSelf.clang; - clangWrapSelf = build: callPackage ../build-support/cc-wrapper { + clangWrapSelf = build: ccWrapperFun { cc = build; isClang = true; stdenv = clangStdenv; @@ -4954,8 +4958,8 @@ with pkgs; extraBuildCommands = '' echo "dontMoveLib64=1" >> $out/nix-support/setup-hook ''; - in wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi extraBuildCommands (cc.cc.override { - stdenv = overrideCC stdenv (wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi "" cc.cc); + in wrapCCWith glibc_multi extraBuildCommands (cc.cc.override { + stdenv = overrideCC stdenv (wrapCCWith glibc_multi "" cc.cc); profiledCompiler = false; enableMultilib = true; })) @@ -5713,7 +5717,7 @@ with pkgs; wla-dx = callPackage ../development/compilers/wla-dx { }; - wrapCCWith = ccWrapper: libc: extraBuildCommands: baseCC: ccWrapper { + wrapCCWith = libc: extraBuildCommands: baseCC: ccWrapperFun { nativeTools = stdenv.cc.nativeTools or false; nativeLibc = stdenv.cc.nativeLibc or false; nativePrefix = stdenv.cc.nativePrefix or ""; @@ -5726,7 +5730,7 @@ with pkgs; ccWrapperFun = callPackage ../build-support/cc-wrapper; - wrapCC = wrapCCWith ccWrapperFun stdenv.cc.libc ""; + wrapCC = wrapCCWith stdenv.cc.libc ""; # legacy version, used for gnat bootstrapping wrapGCC-old = baseGCC: callPackage ../build-support/gcc-wrapper-old { nativeTools = stdenv.cc.nativeTools or false; @@ -6006,7 +6010,7 @@ with pkgs; ocropus = callPackage ../applications/misc/ocropus { }; - inherit (callPackages ../development/interpreters/perl {}) perl perl520 perl522; + inherit (callPackages ../development/interpreters/perl {}) perl perl522 perl524; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; @@ -9015,6 +9019,8 @@ with pkgs; libykneomgr = callPackage ../development/libraries/libykneomgr { }; + libytnef = callPackage ../development/libraries/libytnef { }; + libyubikey = callPackage ../development/libraries/libyubikey { }; libzen = callPackage ../development/libraries/libzen { }; @@ -10906,6 +10912,9 @@ with pkgs; mongodb248 = callPackage ../servers/nosql/mongodb/2.4.8.nix { }; + percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { }; + percona-server = percona-server56; + riak = callPackage ../servers/nosql/riak/2.2.0.nix { erlang = erlang_basho_R16B02; }; @@ -10946,7 +10955,11 @@ with pkgs; neo4j = callPackage ../servers/nosql/neo4j { }; - net_snmp = callPackage ../servers/monitoring/net-snmp { }; + net_snmp = callPackage ../servers/monitoring/net-snmp { + # https://sourceforge.net/p/net-snmp/bugs/2712/ + # remove after net-snmp > 5.7.3 + perl = perl522; + }; newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { }; @@ -13149,6 +13162,7 @@ with pkgs; claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { inherit (gnome3) gsettings_desktop_schemas; + inherit (xorg) libSM; enableNetworkManager = config.networking.networkmanager.enable or false; }; @@ -17509,6 +17523,7 @@ with pkgs; mathcomp = callPackage ../development/coq-modules/mathcomp { }; math-classes = callPackage ../development/coq-modules/math-classes { }; ssreflect = callPackage ../development/coq-modules/ssreflect { }; + QuickChick = callPackage ../development/coq-modules/QuickChick {}; fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; }; @@ -17524,6 +17539,7 @@ with pkgs; interval = callPackage ../development/coq-modules/interval {}; mathcomp = callPackage ../development/coq-modules/mathcomp { }; ssreflect = callPackage ../development/coq-modules/ssreflect { }; + QuickChick = callPackage ../development/coq-modules/QuickChick {}; fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; }; |