From 28299f669adc41e5278372cad952fb1e1165b44b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 27 Sep 2017 11:25:50 +0200 Subject: [PATCH] Add even more dev outputs --- pkgs/desktops/gnome-3/core/gcr/default.nix | 2 ++ pkgs/desktops/gnome-3/core/gnome-keyring/default.nix | 2 ++ pkgs/development/python-modules/cffi/default.nix | 2 ++ pkgs/development/python-modules/requests/default.nix | 2 ++ pkgs/development/python-modules/urllib3/default.nix | 2 ++ pkgs/top-level/python-packages.nix | 4 ++++ 6 files changed, 14 insertions(+) diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix index 55eebf77be5..0798d69f9e6 100644 --- a/pkgs/desktops/gnome-3/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/core/gcr/default.nix @@ -5,6 +5,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + outputs = [ "out" "dev" ]; + buildInputs = [ pkgconfig intltool gnupg glib gobjectIntrospection libxslt libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala_0_32 diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index df47c1a477b..4baafecadd0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -5,6 +5,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + outputs = [ "out" "dev" ]; + buildInputs = with gnome3; [ dbus libgcrypt pam python gtk3 gconf libgnome_keyring pango gcr gdk_pixbuf atk p11_kit diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 5b0265601a3..cced78c0c6a 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -10,6 +10,8 @@ if isPyPy then null else buildPythonPackage rec { sha256 = "1mffyilq4qycm8gs4wkgb18rnqil8a9blqq77chdlshzxc8jkc5k"; }; + outputs = [ "out" "dev" ]; + propagatedBuildInputs = [ libffi pycparser ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index b85bb54a4f1..f3ff4a84f1e 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -12,6 +12,8 @@ buildPythonPackage rec { sha256 = "0zi3v9nsmv9j27d0c0m1dvqyvaxz53g8m0aa1h3qanxs4irkwi4w"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pytest ]; propagatedBuildInputs = [ urllib3 idna chardet certifi ]; # sadly, tests require networking diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 10021e14f12..f030ef74e63 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -12,6 +12,8 @@ buildPythonPackage rec { sha256 = "0kyvc9zdlxr5r96bng5rhm9a6sfqidrbvvkz64s76qs5267dli6c"; }; + outputs = [ "out" "dev" ]; + NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [ "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout" "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1c56fe5f1ab..7c6ca4bd1fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3295,6 +3295,8 @@ in { sha256 = "d04bb2425086c3fe86f7bc48915290b13e798497839fbb18ab7f6dffcf98cc3a"; }; + outputs = [ "out" "dev" ]; + buildInputs = [ pkgs.openssl self.cryptography_vectors ] ++ optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Security; propagatedBuildInputs = with self; [ @@ -17817,6 +17819,8 @@ in { sha256 = "0d283g4zi0hr9papd24mjl70mi15gyzq6fx618rizi87dgipqqax"; }; + outputs = [ "out" "dev" ]; + preCheck = '' sed -i 's/test_set_default_verify_paths/noop/' tests/test_ssl.py # https://github.com/pyca/pyopenssl/issues/692