Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
/ nixpkgs-channels Public archive
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: ee01f461a33e
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: 899cf4ba2927
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 3, 2020

  1. tdlib: enable on darwin 

    (cherry picked from commit fa2546f)
    @veprbl
    veprbl committed Mar 3, 2020
    Copy the full SHA
    17e1561 View commit details

  2. python3Packages.ipykernel: fix build on darwin 

    Also python34 is not supported:

ipython/ipykernel@979e6fd

nixpkgs doesn't provide python34 anymore, so pythonOlder "3.5" is always
true and can be removed.

(cherry picked from commit d35009e)

cc #80940
    @veprbl
    veprbl committed Mar 3, 2020
    Copy the full SHA
    899cf4b View commit details
Showing with 14 additions and 4 deletions.
  1. +1 −1 pkgs/development/libraries/tdlib/default.nix
  2. +13 −3 pkgs/development/python-modules/ipykernel/default.nix
2 changes: 1 addition & 1 deletion pkgs/development/libraries/tdlib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
description = "Cross-platform library for building Telegram clients";
homepage = "https://core.telegram.org/tdlib/";
license = [ licenses.boost ];
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = [ maintainers.vyorkin ];
};
}
16 changes: 13 additions & 3 deletions pkgs/development/python-modules/ipykernel/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@
buildPythonPackage rec {
pname = "ipykernel";
version = "5.1.4";
disabled = pythonOlder "3.4";

src = fetchPypi {
inherit pname version;
@@ -38,12 +37,23 @@ buildPythonPackage rec {
preCheck = ''
export HOME=$(mktemp -d)
'';
disabledTests = lib.optionals stdenv.isDarwin [
disabledTests = lib.optionals stdenv.isDarwin ([
# see https://github.com/NixOS/nixpkgs/issues/76197
"test_subprocess_print"
"test_subprocess_error"
"test_ipython_start_kernel_no_userns"
];
] ++ lib.optionals (pythonOlder "3.8") [
# flaky test https://github.com/ipython/ipykernel/issues/485
"test_shutdown"

# test regression https://github.com/ipython/ipykernel/issues/486
"test_sys_path_profile_dir"
"test_save_history"
"test_help_output"
"test_write_kernel_spec"
"test_ipython_start_kernel_userns"
"ZMQDisplayPublisherTests"
]);

# Some of the tests use localhost networking.
__darwinAllowLocalNetworking = true;