maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Use patched nix

Browse source
This commit is contained in:
Malte Brandy 2021-11-19 14:20:12 +01:00
parent e1568f213c
commit 0dad4dd29a
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
overlays/10-previews.nix
View file

@ -5,7 +5,15 @@ in
{
inherit unstable;
inherit (unstable) cachix nix-output-monitor cabal2nix;
nix = unstable.nix;
nix = super.nix.overrideAttrs (o: {
patches = (o.patches or [ ]) ++ [
(super.fetchpatch {
# Overridable cache priorities
url = "https://github.com/NixOS/nix/commit/f8abbdd4565542464f31f4dc203a9c3e091b3536.patch";
sha256 = "0vbxiab0wd55ccnxkbi86lzmyrvjw946r9scxgq59xiyyss420rl";
})
];
});
unstableHaskellPackages = unstable.haskellPackages;
unstableGhc = unstable.ghc;
mautrix-signal = unstable.mautrix-signal;

2
overlays/pkgSets.nix
View file

@ -1,6 +1,6 @@
self: super: {
# pkgs assumed to be present on a non nixos host
nixFlakes = self.writeShellScriptBin "flix" ''exec ${self.nix}/bin/nix --experimental-features "nix-command flakes" --log-format bar-with-logs "$@"'';
nixFlakes = self.writeShellScriptBin "flix" ''exec ${self.unstable.nix}/bin/nix --experimental-features "nix-command flakes" --log-format bar-with-logs "$@"'';
core-system-pkgs = {
inherit (self)
gitFull gnumake mkpasswd file wget curl wireguard gnupg mutt bind liboping