Add cacert as dependency when building private git

[perso/Immae/Config/Nix.git] / virtual / packages.nix

diff --git a/virtual/packages.nix b/virtual/packages.nix
index 6d85411763972cb0d18f6e97dae99758e2115893..05b0e88f3e89b2aa3b2f76ed42671b513cce3d51 100644 (file)
--- a/virtual/packages.nix
+++ b/virtual/packages.nix
@@ -1,10 +1,5 @@
-with import (builtins.fetchTarball {
-  # FIXME: upgrade to nixpkgs 19 when stable and stick to stable
-  # versions
-  name = "nixos-unstable-2018-12-08";
-  url = https://github.com/nixos/nixpkgs/archive/61c3169a0e17d789c566d5b241bfe309ce4a6275.tar.gz;
-  sha256 = "0qbycg7wkb71v20rchlkafrjfpbk2fnlvvbh3ai9pyfisci5wxvq";
-}) {};
+with import ../libs.nix;
+with nixpkgs_unstable;
 let
   adminer = rec {
     webRoot = pkgs.stdenv.mkDerivation rec {
@@ -38,6 +33,7 @@ let
     apache = {
       user = "wwwrun";
       group = "wwwrun";
+      modules = [ "proxy_fcgi" ];
       vhostConf = ''
         Alias /adminer ${webRoot}
         <Directory ${webRoot}>