Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3e44d2f2b52f
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 79bbe4d54399
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Oct 2, 2018

  1. jshint: depend on phantomjs2 

    (cherry picked from commit 22e9c0a)
    @Mic92
    Philipp Middendorf authored and Mic92 committed Oct 2, 2018
    Copy the full SHA
    0f51003 View commit details

  2. jetbrains: add libnotify to wrapper to enable notifications 

    (cherry picked from commit 0b2f2f3)
    @Mic92
    Philipp Middendorf authored and Mic92 committed Oct 2, 2018
    Copy the full SHA
    9934f41 View commit details

  3. haskell: fix x509-system on mojave 

    darwin.security_tool is currently broken in Mojave. See issue #45042
for more info. Our security_tool stuff comes from 10.9 so I suspect
that it needs an update.

Here I am putting in a hack to get things working again. This uses the
system provided security binary at /usr/bin/security to avoid the
issue in Haskell’s x509-system package. Unfortunately, this will break
with the sandbox. I am also working on a proper fix, but this requires
updating lots of Apple stuff (and also copumpkin’s new CF). You can
follow the progress on this branch:

  https://github.com/matthewbauer/nixpkgs/tree/xcode-security

This commit should be backported to release-18.03 and release-18.09.

/cc @copumpkin @LnL7 @pikajude
    @matthewbauer
    matthewbauer committed Oct 2, 2018
    Copy the full SHA
    79bbe4d View commit details
3 changes: 2 additions & 1 deletion pkgs/applications/editors/jetbrains/common.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, makeDesktopItem, makeWrapper, patchelf, p7zip
, coreutils, gnugrep, which, git, unzip, libsecret
, coreutils, gnugrep, which, git, unzip, libsecret, libnotify
}:

{ name, product, version, src, wmClass, jdk, meta }:
@@ -67,6 +67,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
# Some internals want libstdc++.so.6
stdenv.cc.cc.lib libsecret
libnotify
]}" \
--set JDK_HOME "$jdk" \
--set ${hiName}_JDK "$jdk" \
10 changes: 9 additions & 1 deletion pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -131,8 +131,16 @@ self: super: builtins.intersectAttrs super {
x509-system = if pkgs.stdenv.hostPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc
then let inherit (pkgs.darwin) security_tool;
in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: {
# darwin.security_tool is broken in Mojave (#45042)

# We will use the system provided security for now.
# Beware this WILL break in sandboxes!

# TODO(matthewbauer): If someone really needs this to work in sandboxes,
# I think we can add a propagatedImpureHost dep here, but I’m hoping to
# get a proper fix available soonish.
postPatch = (drv.postPatch or "") + ''
substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security
substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
'';
})
else super.x509-system;
4 changes: 4 additions & 0 deletions pkgs/development/node-packages/default-v8.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,10 @@ nodePackages // {
'';
};

jshint = nodePackages.jshint.override {
buildInputs = [ pkgs.phantomjs2 ];
};

dat = nodePackages.dat.override {
buildInputs = [ nodePackages.node-gyp-build ];
};