gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 04:19:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Redo overlays setup. Move to "final: prev:". Provide TST as overlay

Browse source
This commit is contained in:
kat witch 2021-08-26 02:35:22 +01:00
parent 5a35ac3c3e
commit dc5d6552a1
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
9 changed files with 51 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

31
overlays/default.nix
View file

@ -1,30 +1,17 @@
{ sources, system ? builtins.currentSystem, ... }@args:
let
overlay = self: super: {
nur = import sources.nur {
nurpkgs = self;
pkgs = self;
};
anicca = self.callPackage sources.anicca {};
rustfmt = super.rustfmt.overrideAttrs ({ patches ? [ ], ... }: {
patches = patches ++ [
# Adds an option variant that merges all use statements into a single block.
# Taken from https://github.com/rust-lang/rustfmt/pull/4680
./Implement-One-option-for-imports_granularity-4669.patch
];
});
linuxPackagesFor = kernel: (super.linuxPackagesFor kernel).extend (_: ksuper: {
zfsUnstable = ksuper.zfsUnstable.overrideAttrs (old: { meta = old.meta // { broken = false; }; });
});
};
pkgs = import sources.nixpkgs {
overlays = [
(import (sources.arcexprs + "/overlay.nix"))
(import (sources.katexprs + "/overlay.nix"))
(import ./nur { inherit sources; })
(import sources.emacs-overlay)
overlay
];
(import ./rustfmt)
(import ./firefox-tst)
] ++ (map (path: import "${path}/overlay.nix") [
sources.arcexprs
sources.katexprs
sources.anicca
]);
config = {
allowUnfree = true;
permittedInsecurePackages = [
@ -33,4 +20,4 @@ let
};
};
in
pkgs
pkgs