privatevoid.net/depot
1
1
Fork 0
Code Issues 23 Pull requests 2 Projects 3 Releases Packages Wiki Activity Actions

Use Nix Super on Hydra

Browse source
This commit is contained in:
Max Headroom 2021-08-23 20:49:13 +02:00
parent aef44bebf7
commit ae947191c5
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/autopatch/default.nix
View file

@ -1,6 +1,7 @@
{ pkgs, lib, config, ... }:
{ pkgs, lib, config, inputs, ... }:
{
nixpkgs.overlays = [
(self: super: { flakePackages = inputs.self.packages.${pkgs.system}; })
(self: super:
(let
patched = import ../../packages/patched-derivations.nix super;

9
packages/default.nix
View file

@ -1,8 +1,9 @@
{ pkgs, inputs }@args:
let
patched-derivations = import ./patched-derivations.nix pkgs;
patched-derivations = import ./patched-derivations.nix (pkgs // { flakePackages = all; });
patched-inputs = import ./patched-inputs.nix args;
packages = import ./packages.nix args;
in patched-derivations
// patched-inputs
// packages
all = patched-derivations
// patched-inputs
// packages;
in all

2
packages/patched-derivations.nix
View file

@ -8,7 +8,7 @@ super: rec {
kerberized-dnsutils = kerberized-bind.dnsutils;
kerberized-dig = kerberized-bind.dnsutils;
hydra = patch super.hydra-unstable "patches/base/hydra";
hydra = (patch super.hydra-unstable "patches/base/hydra").override { nix = super.flakePackages.nix-super; };
lain-ipfs = patch-rename super.ipfs "lain-ipfs" "patches/base/ipfs";
}