X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=default.nix;h=c32d23f569e6ed47d3058c435958f8ac79c46fd1;hp=3772d44afd6e8c64549307f42e226d24fb2bd1f9;hb=dc10144003f159e8de99c82f4195587fef64cd46;hpb=25fd1d16198334f678129ddcd6e77ebf7edf9b72

diff --git a/default.nix b/default.nix
index 3772d44..c32d23f 100644
--- a/default.nix
+++ b/default.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
   stable_nixpkgs = import <nixpkgs> {};
   mypkgs = {};
@@ -23,24 +18,6 @@ let
     }
   '';
 
-  fetchedGithub = path:
-    let
-      json = lib.importJSON path;
-    in rec {
-      version = json.tag;
-      name = "${json.meta.name}-${version}";
-      src = fetchFromGitHub json.github;
-    };
-
-  fetchedGit = path:
-    let
-      json = lib.importJSON path;
-    in rec {
-      version = json.tag;
-      name = "${json.meta.name}-${version}";
-      src = fetchgit json.git;
-    };
-
   mypkgs.ledger = (ledger.override { boost = boost166; }).overrideAttrs (_old:
     fetchedGithub ./fetched/ledger.json // {
       postInstall = "";