Use patched nix
This commit is contained in:
parent
e1568f213c
commit
0dad4dd29a
|
@ -5,7 +5,15 @@ in
|
||||||
{
|
{
|
||||||
inherit unstable;
|
inherit unstable;
|
||||||
inherit (unstable) cachix nix-output-monitor cabal2nix;
|
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;
|
unstableHaskellPackages = unstable.haskellPackages;
|
||||||
unstableGhc = unstable.ghc;
|
unstableGhc = unstable.ghc;
|
||||||
mautrix-signal = unstable.mautrix-signal;
|
mautrix-signal = unstable.mautrix-signal;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
self: super: {
|
self: super: {
|
||||||
# pkgs assumed to be present on a non nixos host
|
# 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 = {
|
core-system-pkgs = {
|
||||||
inherit (self)
|
inherit (self)
|
||||||
gitFull gnumake mkpasswd file wget curl wireguard gnupg mutt bind liboping
|
gitFull gnumake mkpasswd file wget curl wireguard gnupg mutt bind liboping
|
||||||
|
|
Loading…
Reference in a new issue