X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=virtual%2Fpackages.nix;h=05b0e88f3e89b2aa3b2f76ed42671b513cce3d51;hb=02bf0d911c2f7b100e22f9d9fd0b1b6b39274293;hp=6d85411763972cb0d18f6e97dae99758e2115893;hpb=a05f8abec045c9bf6a47fd87d028984c1237130c;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/virtual/packages.nix b/virtual/packages.nix index 6d85411..05b0e88 100644 --- 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}