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: 3cee0ce5b870
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: afe328bb5ea0
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Sep 24, 2018

  1. python3Packages.google-compute-engine: fix build (#47267) 

    The dependency `distro` was missing.
See https://hydra.nixos.org/build/81330387

Addresses #45960

(cherry picked from commit baa7e52)
    @Ma27 @xeji
    Ma27 authored and xeji committed Sep 24, 2018
    Copy the full SHA
    32a5d08 View commit details

  2. opencv: 3.4.2 -> 3.4.3 

    (cherry picked from commit 252c0d4)
    @basvandijk
    basvandijk committed Sep 24, 2018
    Copy the full SHA
    afe328b View commit details
11 changes: 3 additions & 8 deletions pkgs/development/libraries/opencv/3.x.nix
View file
Original file line number Diff line number Diff line change
@@ -35,20 +35,20 @@
}:

let
version = "3.4.2";
version = "3.4.3";

src = fetchFromGitHub {
owner = "opencv";
repo = "opencv";
rev = version;
sha256 = "0q752s1ir6iyqbp3pn425fi215fi7bzjl4aa3arvgh6sridda9lx";
sha256 = "138q3wiv4g4xvqzsp93xaqayv7kz7bl2vrgppp8jm8w6m25cd4i2";
};

contribSrc = fetchFromGitHub {
owner = "opencv";
repo = "opencv_contrib";
rev = version;
sha256 = "1fbgbf9xdby9a5yy6bmnkzchdsfii0jagfd373y015cjpr1mrlvz";
sha256 = "1f334glf39nk42mpqq6j732h3ql2mpz89jd4mcl678s8n73nfjh2";
};

# Contrib must be built in order to enable Tesseract support:
@@ -145,11 +145,6 @@ stdenv.mkDerivation rec {
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
'';

# TODO: remove the following patch once commit
# https://github.com/opencv/opencv/commit/e2b5d112909b9dfd764f14833b82e38e4bc2f81f
# is released.
patches = [ ./fix-dnn.patch ];

# This prevents cmake from using libraries in impure paths (which
# causes build failure on non NixOS)
# Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with
13 changes: 0 additions & 13 deletions pkgs/development/libraries/opencv/fix-dnn.patch
View file

This file was deleted.

3 changes: 2 additions & 1 deletion pkgs/tools/virtualization/google-compute-engine/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
, utillinux
, boto
, setuptools
, distro
}:

buildPythonApplication rec {
@@ -42,7 +43,7 @@ buildPythonApplication rec {
cp -r google_config/udev/*.rules $out/lib/udev/rules.d
'';

propagatedBuildInputs = [ boto setuptools ];
propagatedBuildInputs = [ boto setuptools distro ];

doCheck = false;