X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=pkgs%2Fdefault.nix;h=ef6199c7f101e7556772c1e310d661e734d7831c;hb=6a380f40811e9ed4a0fc129d52449a45869bf843;hp=a6630feb465b33c747b11ca399fffa6f57111264;hpb=ccda44f3d06002684668f98c3ea9ba43d967ab65;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/pkgs/default.nix b/pkgs/default.nix index a6630fe..ef6199c 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -45,7 +45,7 @@ rec { bitlbee-mastodon = callPackage ./bitlbee-mastodon {}; composerEnv = callPackage ./composer-env {}; - webapps = callPackage ./webapps { inherit mylibs composerEnv private; }; + webapps = callPackage ./webapps { inherit mylibs composerEnv; }; monitoring-plugins = callPackage ./monitoring-plugins {}; naemon = callPackage ./naemon { inherit mylibs monitoring-plugins; }; @@ -54,10 +54,6 @@ rec { simp_le_0_17 = callPackage ./simp_le {}; certbot = callPackage ./certbot {}; - private = if builtins.pathExists (./. + "/private") - then import ./private { inherit pkgs; } - else { webapps = {}; }; - python3PackagesPlus = callPackage ./python-packages { python = python3; inherit mylibs; @@ -68,11 +64,8 @@ rec { dovecot_fts-xapian = callPackage ./dovecot/plugins/fts_xapian { inherit mylibs; }; - monero_0_15_0_0 = (import (builtins.fetchTarball { - name = "nixos-19.09"; - url = "https://releases.nixos.org/nixos/19.09/nixos-19.09.2145.c2c5dcc00b0/nixexprs.tar.xz"; - sha256 = "0dh8qc3lzrba5mxxxh57i1374wc7ha3c30h7wsmj5zr7bhc5zm4p"; - }) {}).monero; niv = (import sources.niv {}).niv; + + fiche = callPackage ./fiche { inherit mylibs; }; }