From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Mon, 23 Aug 2021 22:29:45 +0000 (+0200)
Subject: Refactor flakes
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=660cb973260f62551294f73e0811b37fc10fd467;p=perso%2FImmae%2FConfig%2FNix.git

Refactor flakes

Third iteration
---

diff --git a/flakes/libspf2/default.nix b/flakes/libspf2/default.nix
index a9e5ec3..d22c738 100644
--- a/flakes/libspf2/default.nix
+++ b/flakes/libspf2/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   patches = [
     (fetchpatch {
       name = "fix-variadic-macros.patch";
-      url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/fix-variadic-macros.patch?h=packages/libspf2";
+      url = "https://github.com/shevek/libspf2/commit/5852828582f556e73751076ad092f72acf7fc8b6.patch";
       sha256 = "00dqpcgjr9jy2qprgqv2qiyvq8y3wlz4yns9xzabf2064jzqh2ic";
     })
   ];
diff --git a/flakes/private/peertube/flake.nix b/flakes/private/peertube/flake.nix
index e16cbaf..e0e0d54 100644
--- a/flakes/private/peertube/flake.nix
+++ b/flakes/private/peertube/flake.nix
@@ -16,6 +16,10 @@
   };
 
   outputs = { self, peertube_origin, peertube_syden }: {
+    overlays = {
+      peertube_syden = final: prev: { peertube_syden = peertube_syden.defaultPackage."${final.system}"; };
+      peertube_origin = final: prev: { peertube_origin = peertube_origin.defaultPackage."${final.system}"; };
+    };
     packages.x86_64-linux.peertube = peertube_origin.packages.x86_64-linux.peertube;
     packages.x86_64-linux.peertube_syden = peertube_syden.packages.x86_64-linux.peertube;
     defaultPackage.x86_64-linux = peertube_origin.defaultPackage.x86_64-linux;
diff --git a/overlays/default.nix b/overlays/default.nix
index 73c7744..9b0615a 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,4 +1,13 @@
-{
+let
+  flakeCompat = import ../lib/flake-compat.nix;
+  flakes = builtins.foldl' (a: b: a // b) {} (map (n: (flakeCompat n).overlays) [
+    ../flakes/libspf2
+    ../flakes/openarc
+    ../flakes/opendmarc
+    ../flakes/peertube
+    ../flakes/private/peertube
+  ]);
+in flakes // {
   mylibs = self: super: { mylibs = import ../lib { pkgs = self; }; };
   mypkgs = self: super: import ../pkgs { pkgs = self; };
 
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 2f5f529..204f751 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -23,8 +23,6 @@ rec {
   notmuch-python2 = callPackage ./notmuch/notmuch-python { pythonPackages = python2Packages; };
   notmuch-python3 = callPackage ./notmuch/notmuch-python { pythonPackages = python3Packages; };
   notmuch-vim = callPackage ./notmuch/notmuch-vim {};
-  openarc = (mylibs.flakeCompat ../flakes/openarc).default;
-  opendmarc = (mylibs.flakeCompat ../flakes/opendmarc).default;
   pg_activity = callPackage ./pg_activity { inherit mylibs; };
   pgloader = callPackage ./pgloader {};
   predixy = callPackage ./predixy { inherit mylibs; };