X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=pkgs%2Fdefault.nix;h=3b0e9377217942315bffbf78d9d9356d7886a4a2;hp=a6630feb465b33c747b11ca399fffa6f57111264;hb=a8ef1adb4a90c2524ac09a85463598e5d41d2a4a;hpb=ccda44f3d06002684668f98c3ea9ba43d967ab65 diff --git a/pkgs/default.nix b/pkgs/default.nix index a6630fe..3b0e937 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -45,19 +45,12 @@ 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; }; naemon-livestatus = callPackage ./naemon-livestatus { inherit mylibs naemon; }; - 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 +61,6 @@ 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; }; }