Move mediagoblin to pkgs

[perso/Immae/Config/Nix.git] / default.nix

diff --git a/default.nix b/default.nix
index 1b9b4b08d4211543d24b33a8d02dbe1b44cac32d..e092c3384cd57646724399d050ecdb9d54c5da56 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -1,41 +1,10 @@
-with import <nixpkgs> {};
+{ pkgs ? import <nixpkgs> {} }:
 let
-  nixpkgs = import <nixpkgs> {};
-  fetchedGithub = path:
-    let
-      json = lib.importJSON path;
-    in rec {
-      version = json.tag;
-      name = "${json.meta.name}-${version}";
-      src = fetchFromGitHub json.github;
-    };
-
-  ledger = (nixpkgs.ledger.override { boost = boost166; }).overrideAttrs (oldAttrs:
-    fetchedGithub ./fetched/ledger.json // {
-      postInstall = "";
-    }
-  );
-
-  taskwarrior = nixpkgs.taskwarrior.overrideAttrs (oldAttrs: rec {
-    postInstall = ''${oldAttrs.postInstall}
-      mkdir -p "$out/share/vim/vimfiles/ftdetect"
-      mkdir -p "$out/share/vim/vimfiles/syntax"
-      ln -s "../../../../share/doc/task/scripts/vim/ftdetect/task.vim" "$out/share/vim/vimfiles/ftdetect/"
-      ln -s "../../../../share/doc/task/scripts/vim/syntax/taskrc.vim" "$out/share/vim/vimfiles/syntax/"
-      ln -s "../../../../share/doc/task/scripts/vim/syntax/taskdata.vim" "$out/share/vim/vimfiles/syntax/"
-      ln -s "../../../../share/doc/task/scripts/vim/syntax/taskedit.vim" "$out/share/vim/vimfiles/syntax/"
-    '';
-  });
-
-  vit = (nixpkgs.vit.override { inherit taskwarrior; }).overrideAttrs (oldAttrs:
-    fetchedGithub ./fetched/vit.json // {
-      buildInputs = oldAttrs.buildInputs ++ [perlPackages.TryTiny perlPackages.TextCharWidth];
-    }
-  );
-
-  #weechat = callPackage nixpkgs.weechat { guileSupport = false; luaSupport = false; rubySupport = false; tclSupport = false; };
+  pkgs_ = pkgs;
+  mypkgs = import ./pkgs { pkgs = pkgs_; };
 in
-  {
-    inherit ledger;
-    inherit taskwarrior vit;
-  }
+{
+  lib = import ./libs.nix { pkgs = pkgs_; };
+  overlays = import ./overlays;
+  pkgs = mypkgs;
+} // mypkgs