overlays: Import the simple overlay

This commit is contained in:
PapaTutuWawa 2021-11-05 12:49:14 +01:00
parent d29e35ba91
commit 5e8c297d03
4 changed files with 4 additions and 23 deletions

View File

@ -41,6 +41,7 @@ in inputs.nixpkgs.lib.nixosSystem {
nur.overlay nur.overlay
emacs.overlay emacs.overlay
(import ../packages) (import ../packages)
(import ../overlays/simple.nix)
]; ];
} }

View File

@ -1,16 +1,6 @@
{ { pkgs }:
pkgs
, lib
}:
{ {
emacs = import (builtins.fetchGit {
url = "https://github.com/nix-community/emacs-overlay.git";
ref = "master";
rev = "ce0e9482d53d69bedc8416d8a984d00e17607826";
});
nur = import ./nur.nix pkgs;
custom = import ../packages;
simple = import ./simple.nix; simple = import ./simple.nix;
surface = import ./surface.nix pkgs; surface = import ./surface.nix pkgs;
} }

View File

@ -1,10 +0,0 @@
pkgs: final: prev:
{
nur = import (builtins.fetchTarball {
url = "https://github.com/nix-community/NUR/archive/master.tar.gz";
sha256 = "0fz7zdfvjfjzg46w7khvwr5jhpd9w8yx0cdd9gnmbkzxhbspbmwq";
}) {
inherit pkgs;
};
}

View File

@ -1,8 +1,8 @@
pkgs: final: prev: final: prev:
let let
libwacomPatchesCommit = "f811946d7d8bacb3b9ee75f08c150c435ad59331"; libwacomPatchesCommit = "f811946d7d8bacb3b9ee75f08c150c435ad59331";
mkPatch = name: sha256: pkgs.fetchpatch { mkPatch = name: sha256: prev.fetchpatch {
name = "${name}.patch"; name = "${name}.patch";
url = "https://raw.githubusercontent.com/linux-surface/libwacom-surface/${libwacomPatchesCommit}/${name}.patch"; url = "https://raw.githubusercontent.com/linux-surface/libwacom-surface/${libwacomPatchesCommit}/${name}.patch";
sha256 = sha256; sha256 = sha256;