pin some packages to openssl 1.0.2 for now

NixOS · Feb 3, 2017 · 0089f72 · 0089f72
1 parent 9c3d796
commit 0089f72
Show file tree

Hide file tree

Showing 7 changed files with 235 additions and 79 deletions.
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -54,7 +54,9 @@ rec {
 
   git-cola = callPackage ./git-cola { };
 
-  git-crypt = callPackage ./git-crypt { };
+  git-crypt = callPackage ./git-crypt {
+    openssl = openssl_1_0_2;
+  };
 
   git-extras = callPackage ./git-extras { };
 

diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix
@@ -1,7 +1,10 @@
 { callPackage, pkgs }:
 rec {
   #### CORE EFL
-  efl = callPackage ./efl.nix { openjpeg = pkgs.openjpeg_1; };
+  efl = callPackage ./efl.nix {
+    openjpeg = pkgs.openjpeg_1;
+    openssl = pkgs.openssl_1_0_2;
+  };
 
   #### WINDOW MANAGER
   enlightenment = callPackage ./enlightenment.nix { };

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, self, stdenv, gettext, gvfs, libunique, bison2
+{ callPackage, self, stdenv, gettext, gvfs, libunique, bison2, openssl_1_0_2
 , libstartup_notification, overrides ? {} }:
 
 let overridden = set // overrides; set = with overridden; {
@@ -50,7 +50,9 @@ let overridden = set // overrides; set = with overridden; {
   gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { };
   python_rsvg = overridden.gnome_python_desktop;
 
-  gnome_vfs = callPackage ./platform/gnome-vfs { };
+  gnome_vfs = callPackage ./platform/gnome-vfs {
+    openssl = openssl_1_0_2;
+  };
 
   gnome_vfs_monikers = callPackage ./platform/gnome-vfs-monikers { };
 

diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix
@@ -370,7 +370,9 @@ let
 
   libgames-support = callPackage ./misc/libgames-support { };
 
-  libgda = callPackage ./misc/libgda { };
+  libgda = callPackage ./misc/libgda {
+    openssl = pkgs.openssl_1_0_2;
+  };
 
   libgit2-glib = callPackage ./misc/libgit2-glib { };