commit 67a72b31d165df5ac63c0b863393b85cf35a9cff
parent b4b70b35d6e74571e88d694966736da100658348
Author: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 18 Dec 2020 15:58:10 +0100
nix: move overlays to nix/overlays
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat:
12 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/overlays/compat/overlays.nix b/nix/overlays/compat/overlays.nix
diff --git a/overlays/emacs/builder.nix b/nix/overlays/emacs/builder.nix
diff --git a/overlays/mkSecret.nix b/nix/overlays/mkSecret.nix
diff --git a/nix/overlays/sbr.nix b/nix/overlays/sbr.nix
@@ -0,0 +1,40 @@
+self: super:
+let
+ compileEmacsFiles = super.callPackage ./emacs/builder.nix;
+in
+rec {
+ scripts = import ../packages/my/scripts {
+ inherit (self) stdenv;
+ };
+ vrsync = import ../packages/my/vrsync {
+ inherit (self) stdenv lib;
+ };
+ vde-thinkpad = import ../packages/my/vde-thinkpad {
+ inherit (self) stdenv lib;
+ };
+ bekind = super.callPackage ../../tools/bekind { };
+
+ my = import ../packages {
+ inherit (self) pkgs;
+ };
+
+ bookmark-plus = compileEmacsFiles {
+ name = "bookmark-plus";
+ src = super.fetchFromGitHub {
+ owner = "emacsmirror";
+ repo = "bookmark-plus";
+ rev = "73b8e1c2195860a8c24b5e2961914780c19cf5e3";
+ sha256 = "09aprlawi3m7qrdas3zlk52niap2sr741qzfpjwc2c22hrlyv8ng";
+ };
+ };
+ dired-plus = compileEmacsFiles {
+ name = "dired-plus";
+ src = super.fetchFromGitHub {
+ owner = "emacsmirror";
+ repo = "dired-plus";
+ rev = "db4d82a6b1995a3aa31bd7f2dcaf9b83335d5576";
+ sha256 = "10rfjf6gn5cx1kxq97xq7p24rnkw0hnzj32x4hny7bc6s3635d3x";
+ };
+ };
+
+}
diff --git a/nix/overlays/unstable.nix b/nix/overlays/unstable.nix
@@ -0,0 +1,10 @@
+_: _:
+let
+ unstable = (import ../.).pkgs-unstable { };
+in
+{
+ inherit (unstable)
+ # cachix
+ #git
+ ;
+}
diff --git a/nix/packages/default.nix b/nix/packages/default.nix
@@ -25,7 +25,7 @@ let
];
buildInputs = old.buildInputs ++ [ pkgs.jansson ];
patches = [
- ../overlays/patches/clean-env.patch
+ ./patches/clean-env.patch
];
}
);
diff --git a/overlays/patches/.gitkeep b/nix/packages/patches/.gitkeep
diff --git a/overlays/patches/clean-env.patch b/nix/packages/patches/clean-env.patch
diff --git a/overlays/patches/tramp-detect-wrapped-gvfsd.patch b/nix/packages/patches/tramp-detect-wrapped-gvfsd.patch
diff --git a/overlays/sbr.nix b/overlays/sbr.nix
@@ -1,40 +0,0 @@
-self: super:
-let
- compileEmacsFiles = super.callPackage ./emacs/builder.nix;
-in
-rec {
- scripts = import ../nix/packages/my/scripts {
- inherit (self) stdenv;
- };
- vrsync = import ../nix/packages/my/vrsync {
- inherit (self) stdenv lib;
- };
- vde-thinkpad = import ../nix/packages/my/vde-thinkpad {
- inherit (self) stdenv lib;
- };
- bekind = super.callPackage ../tools/bekind { };
-
- my = import ../nix/packages {
- inherit (self) pkgs;
- };
-
- bookmark-plus = compileEmacsFiles {
- name = "bookmark-plus";
- src = super.fetchFromGitHub {
- owner = "emacsmirror";
- repo = "bookmark-plus";
- rev = "73b8e1c2195860a8c24b5e2961914780c19cf5e3";
- sha256 = "09aprlawi3m7qrdas3zlk52niap2sr741qzfpjwc2c22hrlyv8ng";
- };
- };
- dired-plus = compileEmacsFiles {
- name = "dired-plus";
- src = super.fetchFromGitHub {
- owner = "emacsmirror";
- repo = "dired-plus";
- rev = "db4d82a6b1995a3aa31bd7f2dcaf9b83335d5576";
- sha256 = "10rfjf6gn5cx1kxq97xq7p24rnkw0hnzj32x4hny7bc6s3635d3x";
- };
- };
-
-}
diff --git a/overlays/unstable.nix b/overlays/unstable.nix
@@ -1,10 +0,0 @@
-_: _:
-let
- unstable = (import ./nix).pkgs-unstable { };
-in
-{
- inherit (unstable)
- # cachix
- #git
- ;
-}
diff --git a/systems/modules/core/nix.nix b/systems/modules/core/nix.nix
@@ -89,9 +89,9 @@ in
nixpkgs = {
overlays = [
- (import ../../../overlays/mkSecret.nix)
- (import ../../../overlays/sbr.nix)
- (import ../../../overlays/unstable.nix)
+ (import ../../../nix/overlays/mkSecret.nix)
+ (import ../../../nix/overlays/sbr.nix)
+ (import ../../../nix/overlays/unstable.nix)
(import ../../../nix).emacs
];
config = {
@@ -101,7 +101,7 @@ in
system = {
extraSystemBuilderCmds = ''
ln -sv ${pkgs.path} $out/nixpkgs
- ln -sv ${../../../overlays} $out/overlays
+ ln -sv ${../../../nix/overlays} $out/overlays
'';
stateVersion = "20.03";
