diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 54 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/splice.nix | 79 |
5 files changed, 101 insertions, 41 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3f358f57041..6f74928d2f55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2012,7 +2012,9 @@ with pkgs; djbdns = callPackage ../tools/networking/djbdns { }; - dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy { }; + dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy/1.x { }; + + dnscrypt-proxy2 = callPackage ../tools/networking/dnscrypt-proxy/2.x { }; dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { }; @@ -2110,6 +2112,8 @@ with pkgs; drone = callPackage ../development/tools/continuous-integration/drone { }; + drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { }; + dropbear = callPackage ../tools/networking/dropbear { }; dtach = callPackage ../tools/misc/dtach { }; @@ -6532,7 +6536,7 @@ with pkgs; haskell = callPackage ./haskell-packages.nix { }; - haskellPackages = haskell.packages.ghc822.override { + haskellPackages = haskell.packages.ghc843.override { overrides = config.haskellPackageOverrides or haskell.packageOverrides; }; @@ -6577,6 +6581,10 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_06; }; + pyre = callPackage ../development/tools/pyre { + ocamlPackages = ocaml-ng.ocamlPackages_4_06; + }; + dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {}); glslang = callPackage ../development/compilers/glslang { }; @@ -7796,6 +7804,10 @@ with pkgs; buildozer = bazel-buildtools; unused_deps = bazel-buildtools; + bazel-deps = callPackage ../development/tools/build-managers/bazel/bazel-deps { + buildBazelPackage = buildBazelPackage.override { enableNixHacks = false; }; + }; + buildBazelPackage = callPackage ../build-support/build-bazel-package { }; bear = callPackage ../development/tools/build-managers/bear { }; @@ -8513,6 +8525,10 @@ with pkgs; flex = flex_2_5_35; }; + spoofer = callPackage ../tools/networking/spoofer { }; + + spoofer-gui = callPackage ../tools/networking/spoofer { withGUI = true; }; + sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { }; sselp = callPackage ../tools/X11/sselp{ }; @@ -8606,10 +8622,14 @@ with pkgs; xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; - xcbuild = callPackage ../development/tools/xcbuild/wrapper.nix { + xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; stdenv = buildPackages.clangStdenv; }; + xcbuild = xcodebuild; + xcbuildHook = makeSetupHook { + deps = [ xcbuild ]; + } ../development/tools/xcbuild/setup-hook.sh ; xmlindent = callPackage ../development/web/xmlindent {}; @@ -12921,6 +12941,8 @@ with pkgs; libpulseaudio = libpulseaudio-vanilla; + pulseeffects = callPackage ../applications/audio/pulseeffects { }; + tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; pies = callPackage ../servers/pies { }; @@ -13693,6 +13715,11 @@ with pkgs; [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.4" kernelPatches.modinst_arg_list_too_long + # 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 ]; }; @@ -13701,6 +13728,11 @@ with pkgs; [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.9" kernelPatches.modinst_arg_list_too_long + # 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 ]; }; @@ -13711,6 +13743,11 @@ with pkgs; # when adding a new linux version kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long + # 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 ]; }; @@ -13722,6 +13759,11 @@ 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 ]; }; @@ -16562,6 +16604,8 @@ with pkgs; spectrwm = callPackage ../applications/window-managers/spectrwm { }; + super-productivity = callPackage ../applications/networking/super-productivity { }; + wlc = callPackage ../development/libraries/wlc { }; wlroots = callPackage ../development/libraries/wlroots { }; rootston = wlroots.bin; @@ -19545,6 +19589,8 @@ with pkgs; holdingnuts = callPackage ../games/holdingnuts { }; + hyperrogue = callPackage ../games/hyperrogue { }; + icbm3d = callPackage ../games/icbm3d { }; ingen = callPackage ../applications/audio/ingen { @@ -20266,6 +20312,8 @@ with pkgs; minimap2 = callPackage ../applications/science/biology/minimap2 { }; + mosdepth = callPackage ../applications/science/biology/mosdepth { }; + ncbi_tools = callPackage ../applications/science/biology/ncbi-tools { }; paml = callPackage ../applications/science/biology/paml { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cb8135294b83..7836f71e2eae 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -75,8 +75,8 @@ in rec { ghc861 = callPackage ../development/compilers/ghc/8.6.1.nix rec { bootPkgs = packages.ghc822; inherit (bootPkgs) alex happy hscolour; - buildLlvmPackages = buildPackages.llvmPackages_5; - llvmPackages = pkgs.llvmPackages_5; + buildLlvmPackages = buildPackages.llvmPackages_6; + llvmPackages = pkgs.llvmPackages_6; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { bootPkgs = packages.ghc821Binary; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a0e91a8e0932..fb51cb949442 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -321,6 +321,8 @@ let inifiles = callPackage ../development/ocaml-modules/inifiles { }; + iri = callPackage ../development/ocaml-modules/iri { }; + jingoo = callPackage ../development/ocaml-modules/jingoo { pcre = ocaml_pcre; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0cbd5f0b468b..6ac09121fac2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6317,9 +6317,6 @@ in { guessit = callPackage ../development/python-modules/guessit { }; - # used by flexget - guessit_2_0 = callPackage ../development/python-modules/guessit/2.0.nix { }; - rebulk = callPackage ../development/python-modules/rebulk { }; gunicorn = callPackage ../development/python-modules/gunicorn { }; diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 1fde08d1d48b..27e8136cd397 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -31,17 +31,13 @@ let then defaultBuildHostScope else assert pkgs.hostPlatform == pkgs.buildPlatform; defaultHostTargetScope; defaultHostHostScope = {}; # unimplemented - # TODO(@Ericson2314): we shouldn't preclude run-time fetching by removing - # these attributes. We should have a more general solution for selecting - # whether `nativeDrv` or `crossDrv` is the default in `defaultScope`. - pkgsWithoutFetchers = lib.filterAttrs (n: _: !lib.hasPrefix "fetch" n) pkgs; - targetPkgsWithoutFetchers = lib.filterAttrs (n: _: !lib.hasPrefix "fetch" n) pkgs.targetPackages; - defaultHostTargetScope = pkgsWithoutFetchers // pkgs.xorg; - defaultTargetTargetScope = targetPkgsWithoutFetchers // targetPkgsWithoutFetchers.xorg or {}; + defaultHostTargetScope = pkgs // pkgs.xorg; + defaultTargetTargetScope = pkgs.targetPackages // pkgs.targetPackages.xorg or {}; - splicer = pkgsBuildBuild: pkgsBuildHost: pkgsBuildTarget: - pkgsHostHost: pkgsHostTarget: - pkgsTargetTarget: let + spliceReal = { pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget + , pkgsHostHost, pkgsHostTarget + , pkgsTargetTarget + }: let mash = # Other pkgs sets pkgsBuildBuild // pkgsBuildTarget // pkgsHostHost // pkgsTargetTarget @@ -55,7 +51,7 @@ let valueBuildBuild = pkgsBuildBuild.${name} or {}; valueBuildHost = pkgsBuildHost.${name} or {}; valueBuildTarget = pkgsBuildTarget.${name} or {}; - valueHostHost = throw "`valueHostHost` unimplemented: pass manually rather than relying on splicer."; + valueHostHost = throw "`valueHostHost` unimplemented: pass manually rather than relying on splice."; valueHostTarget = pkgsHostTarget.${name} or {}; valueTargetTarget = pkgsTargetTarget.${name} or {}; augmentedValue = defaultValue @@ -82,38 +78,51 @@ let in # The derivation along with its outputs, which we recur # on to splice them together. - if lib.isDerivation defaultValue then augmentedValue // splicer - (tryGetOutputs valueBuildBuild) (tryGetOutputs valueBuildHost) (tryGetOutputs valueBuildTarget) - (tryGetOutputs valueHostHost) (getOutputs valueHostTarget) - (tryGetOutputs valueTargetTarget) + if lib.isDerivation defaultValue then augmentedValue // spliceReal { + pkgsBuildBuild = tryGetOutputs valueBuildBuild; + pkgsBuildHost = tryGetOutputs valueBuildHost; + pkgsBuildTarget = tryGetOutputs valueBuildTarget; + pkgsHostHost = tryGetOutputs valueHostHost; + pkgsHostTarget = getOutputs valueHostTarget; + pkgsTargetTarget = tryGetOutputs valueTargetTarget; # Just recur on plain attrsets - else if lib.isAttrs defaultValue then splicer - valueBuildBuild valueBuildHost valueBuildTarget - {} valueHostTarget - valueTargetTarget + } else if lib.isAttrs defaultValue then spliceReal { + pkgsBuildBuild = valueBuildBuild; + pkgsBuildHost = valueBuildHost; + pkgsBuildTarget = valueBuildTarget; + pkgsHostHost = {}; + pkgsHostTarget = valueHostTarget; + pkgsTargetTarget = valueTargetTarget; # Don't be fancy about non-derivations. But we could have used used # `__functor__` for functions instead. - else defaultValue; + } else defaultValue; }; in lib.listToAttrs (map merge (lib.attrNames mash)); - splicedPackages = - if actuallySplice - then - splicer - defaultBuildBuildScope defaultBuildHostScope defaultBuildTargetScope - defaultHostHostScope defaultHostTargetScope - defaultTargetTargetScope - // { - # These should never be spliced under any circumstances - inherit (pkgs) pkgs buildPackages targetPackages - buildPlatform targetPlatform hostPlatform; - } - else pkgs // pkgs.xorg; + splicePackages = { pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget + , pkgsHostHost, pkgsHostTarget + , pkgsTargetTarget + } @ args: + if actuallySplice then spliceReal args else pkgsHostTarget; + + splicedPackages = splicePackages { + pkgsBuildBuild = defaultBuildBuildScope; + pkgsBuildHost = defaultBuildHostScope; + pkgsBuildTarget = defaultBuildTargetScope; + pkgsHostHost = defaultHostHostScope; + pkgsHostTarget = defaultHostTargetScope; + pkgsTargetTarget = defaultTargetTargetScope; + } // { + # These should never be spliced under any circumstances + inherit (pkgs) pkgs buildPackages targetPackages + buildPlatform targetPlatform hostPlatform; + }; in { + inherit splicePackages; + # We use `callPackage' to be able to omit function arguments that can be # obtained `pkgs` or `buildPackages` and their `xorg` package sets. Use # `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below). @@ -122,4 +131,8 @@ in callPackages = lib.callPackagesWith splicedPackages; newScope = extra: lib.callPackageWith (splicedPackages // extra); + + # Haskell package sets need this because they reimplement their own + # `newScope`. + __splicedPackages = splicedPackages // { recurseForDerivations = false; }; } |