2023-03-03 23:20:59 +01:00
|
|
|
final: prev:
|
2023-03-17 12:49:30 +01:00
|
|
|
let
|
2023-07-14 21:22:29 +02:00
|
|
|
extraPkgs = import ./pkgs/default.nix {
|
|
|
|
inherit (final) lib callPackage;
|
|
|
|
};
|
2023-03-17 12:49:30 +01:00
|
|
|
inherit (final) fetchpatch;
|
2023-03-25 00:43:13 +01:00
|
|
|
lua_no_readline = prev.lua5_3.overrideAttrs(o: {
|
2023-03-22 20:28:34 +01:00
|
|
|
name = "lua-tty";
|
|
|
|
preBuild = ''
|
|
|
|
makeFlagsArray+=(PLAT="posix" SYSLIBS="-Wl,-E -ldl" CFLAGS="-O2 -fPIC -DLUA_USE_POSIX -DLUA_USE_DLOPEN")
|
|
|
|
'';
|
2023-04-19 23:03:18 +02:00
|
|
|
# lua in nixpkgs has a postInstall stanza that assumes only
|
|
|
|
# one output, we need to override that if we're going to
|
|
|
|
# convert to multi-output
|
|
|
|
# outputs = ["bin" "man" "out"];
|
2023-03-22 20:28:34 +01:00
|
|
|
makeFlags =
|
|
|
|
builtins.filter (x: (builtins.match "(PLAT|MYLIBS).*" x) == null)
|
|
|
|
o.makeFlags;
|
|
|
|
});
|
2023-04-23 00:03:36 +02:00
|
|
|
|
2023-04-19 22:44:06 +02:00
|
|
|
s6 = prev.s6.overrideAttrs(o:
|
2023-04-23 00:03:36 +02:00
|
|
|
let
|
|
|
|
patch = fetchpatch {
|
|
|
|
# add "p" directive in s6-log
|
|
|
|
url = "https://github.com/skarnet/s6/commit/ddc76841398dfd5e18b22943727ad74b880236d3.patch";
|
|
|
|
hash = "sha256-fBtUinBdp5GqoxgF6fcR44Tu8hakxs/rOShhuZOgokc=";
|
|
|
|
};
|
|
|
|
patch_needed = builtins.compareVersions o.version "2.11.1.2" <= 0;
|
2023-04-19 22:44:06 +02:00
|
|
|
in {
|
2023-04-23 00:03:36 +02:00
|
|
|
configureFlags = (builtins.filter
|
|
|
|
(x: (builtins.match ".*shared.*" x) == null)
|
|
|
|
o.configureFlags) ++
|
|
|
|
[
|
2023-04-19 22:44:06 +02:00
|
|
|
"--disable-allstatic"
|
|
|
|
"--disable-static"
|
|
|
|
"--enable-shared"
|
|
|
|
];
|
2023-04-23 00:04:03 +02:00
|
|
|
hardeningDisable = ["all"];
|
2023-04-19 22:44:06 +02:00
|
|
|
stripAllList = [ "sbin" "bin" ];
|
|
|
|
patches =
|
|
|
|
(if o ? patches then o.patches else []) ++
|
|
|
|
(if patch_needed then [ patch ] else []);
|
|
|
|
});
|
2023-07-02 19:19:54 +02:00
|
|
|
lua = let s = lua_no_readline.override { self = s; }; in s;
|
2023-03-03 23:20:59 +01:00
|
|
|
in
|
|
|
|
extraPkgs // {
|
2023-12-02 18:08:59 +01:00
|
|
|
# liminix library functions
|
|
|
|
lim = {
|
|
|
|
parseInt = s : (builtins.fromTOML "r=${s}").r;
|
|
|
|
};
|
2023-04-10 21:04:23 +02:00
|
|
|
|
2023-12-02 18:08:59 +01:00
|
|
|
# keep these alphabetical
|
2023-06-19 22:37:06 +02:00
|
|
|
chrony =
|
|
|
|
let chrony' = prev.chrony.overrideAttrs(o: {
|
|
|
|
configureFlags = [
|
|
|
|
"--chronyvardir=$(out)/var/lib/chrony"
|
|
|
|
"--disable-readline"
|
|
|
|
"--disable-editline"
|
|
|
|
];
|
|
|
|
});
|
|
|
|
in chrony'.override {
|
|
|
|
gnutls = null;
|
|
|
|
nss = null;
|
|
|
|
nspr = null;
|
|
|
|
readline = null;
|
2023-06-20 21:09:17 +02:00
|
|
|
libedit = null;
|
2023-06-19 22:37:06 +02:00
|
|
|
libseccomp = null;
|
2023-06-20 21:09:17 +02:00
|
|
|
# should texinfo be in nativeBuildInputs instead of
|
|
|
|
# buildInputs?
|
|
|
|
texinfo = null;
|
2023-04-19 00:57:15 +02:00
|
|
|
|
2023-06-20 21:09:17 +02:00
|
|
|
};
|
2023-04-19 00:57:15 +02:00
|
|
|
|
2023-03-05 00:08:25 +01:00
|
|
|
|
2022-10-08 21:05:17 +02:00
|
|
|
dnsmasq =
|
|
|
|
let d = prev.dnsmasq.overrideAttrs(o: {
|
|
|
|
preBuild = ''
|
|
|
|
makeFlagsArray=("COPTS=")
|
|
|
|
'';
|
|
|
|
});
|
|
|
|
in d.override {
|
2023-03-03 23:20:59 +01:00
|
|
|
dbusSupport = false;
|
|
|
|
nettle = null;
|
|
|
|
};
|
2023-02-22 19:41:41 +01:00
|
|
|
|
2023-12-02 18:08:59 +01:00
|
|
|
dropbear = prev.dropbear.overrideAttrs (o: {
|
|
|
|
postPatch = ''
|
|
|
|
(echo '#define DSS_PRIV_FILENAME "/run/dropbear/dropbear_dss_host_key"'
|
|
|
|
echo '#define RSA_PRIV_FILENAME "/run/dropbear/dropbear_rsa_host_key"'
|
|
|
|
echo '#define ECDSA_PRIV_FILENAME "/run/dropbear/dropbear_ecdsa_host_key"'
|
|
|
|
echo '#define ED25519_PRIV_FILENAME "/run/dropbear/dropbear_ed25519_host_key"') > localoptions.h
|
|
|
|
'';
|
|
|
|
});
|
|
|
|
|
2023-04-22 23:17:35 +02:00
|
|
|
hostapd =
|
|
|
|
let
|
|
|
|
config = [
|
|
|
|
"CONFIG_DRIVER_NL80211=y"
|
|
|
|
"CONFIG_IAPP=y"
|
|
|
|
"CONFIG_IEEE80211AC=y"
|
|
|
|
"CONFIG_IEEE80211N=y"
|
|
|
|
"CONFIG_IEEE80211W=y"
|
|
|
|
"CONFIG_INTERNAL_LIBTOMMATH=y"
|
|
|
|
"CONFIG_INTERNAL_LIBTOMMATH_FAST=y"
|
|
|
|
"CONFIG_IPV6=y"
|
|
|
|
"CONFIG_LIBNL32=y"
|
|
|
|
"CONFIG_PKCS12=y"
|
|
|
|
"CONFIG_RSN_PREAUTH=y"
|
|
|
|
"CONFIG_TLS=internal"
|
|
|
|
];
|
|
|
|
h = prev.hostapd.overrideAttrs(o: {
|
|
|
|
extraConfig = "";
|
|
|
|
configurePhase = ''
|
|
|
|
cat > hostapd/defconfig <<EOF
|
|
|
|
${builtins.concatStringsSep "\n" config}
|
|
|
|
EOF
|
|
|
|
${o.configurePhase}
|
|
|
|
'';
|
|
|
|
});
|
|
|
|
in h.override { openssl = null; sqlite = null; };
|
2023-03-06 18:49:59 +01:00
|
|
|
|
2023-12-02 18:08:59 +01:00
|
|
|
kexec-tools-static = prev.kexec-tools.overrideAttrs(o: {
|
|
|
|
# For kexecboot we copy kexec into a ramdisk on the system being
|
|
|
|
# upgraded from. This is more likely to work if kexec is
|
|
|
|
# statically linked so doesn't have dependencies on store paths that
|
|
|
|
# may not exist on that machine. (We can't nix-copy-closure as
|
|
|
|
# the store may not be on a writable filesystem)
|
|
|
|
LDFLAGS = "-static";
|
|
|
|
|
|
|
|
patches = o.patches ++ [
|
|
|
|
(fetchpatch {
|
|
|
|
# merge user command line options into DTB chosen
|
|
|
|
url = "https://patch-diff.githubusercontent.com/raw/horms/kexec-tools/pull/3.patch";
|
|
|
|
hash = "sha256-MvlJhuex9dlawwNZJ1sJ33YPWn1/q4uKotqkC/4d2tk=";
|
|
|
|
})
|
|
|
|
pkgs/kexec-map-file.patch
|
|
|
|
];
|
|
|
|
});
|
|
|
|
|
|
|
|
luaFull = prev.lua;
|
|
|
|
inherit lua;
|
|
|
|
|
|
|
|
mtdutils = prev.mtdutils.overrideAttrs(o: {
|
|
|
|
patches = (if o ? patches then o.patches else []) ++ [
|
|
|
|
./pkgs/mtdutils/0001-mkfs.jffs2-add-graft-option.patch
|
|
|
|
];
|
|
|
|
});
|
|
|
|
|
|
|
|
nftables = prev.nftables.overrideAttrs(o: {
|
|
|
|
configureFlags = [
|
|
|
|
"--disable-debug"
|
|
|
|
"--disable-python"
|
|
|
|
"--with-mini-gmp"
|
|
|
|
"--without-cli"
|
|
|
|
];
|
2023-03-04 01:39:54 +01:00
|
|
|
});
|
|
|
|
|
2023-09-12 19:44:43 +02:00
|
|
|
openssl = prev.openssl.overrideAttrs (o: {
|
|
|
|
# we want to apply
|
|
|
|
# https://patch-diff.githubusercontent.com/raw/openssl/openssl/pull/20273.patch";
|
|
|
|
# which disables overriding the -march cflags to the wrong values,
|
|
|
|
# but openssl is used for bootstrapping so that's easier said than
|
|
|
|
# done. Do it the ugly way..
|
|
|
|
postPatch =
|
|
|
|
o.postPatch
|
|
|
|
+ (with final;
|
|
|
|
lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform)
|
|
|
|
"\nsed -i.bak 's/linux.*-mips/linux-mops/' Configure\n");
|
|
|
|
});
|
|
|
|
|
2023-12-02 18:08:59 +01:00
|
|
|
pppBuild = prev.ppp;
|
|
|
|
|
2023-11-02 14:43:24 +01:00
|
|
|
qemu = prev.qemu.overrideAttrs (o: {
|
|
|
|
patches = o.patches ++ [
|
|
|
|
./pkgs/qemu/arm-image-friendly-load-addr.patch
|
|
|
|
|
|
|
|
];
|
|
|
|
});
|
|
|
|
|
2023-12-02 18:08:59 +01:00
|
|
|
rsyncSmall =
|
|
|
|
let r = prev.rsync.overrideAttrs(o: {
|
|
|
|
configureFlags = o.configureFlags ++ [
|
|
|
|
"--disable-openssl"
|
|
|
|
];
|
|
|
|
});
|
|
|
|
in r.override { openssl = null; };
|
2023-11-05 16:13:06 +01:00
|
|
|
|
2023-12-02 18:08:59 +01:00
|
|
|
|
|
|
|
inherit s6;
|
|
|
|
s6-linux-init = prev.s6-linux-init.override {
|
|
|
|
skawarePackages = prev.skawarePackages // {
|
|
|
|
inherit s6;
|
|
|
|
};
|
|
|
|
};
|
|
|
|
s6-rc = prev.s6-rc.override {
|
|
|
|
skawarePackages = prev.skawarePackages // {
|
|
|
|
inherit s6;
|
|
|
|
};
|
2023-11-05 16:13:06 +01:00
|
|
|
};
|
2023-12-02 18:08:59 +01:00
|
|
|
|
|
|
|
strace = prev.strace.override { libunwind = null; };
|
2023-12-05 00:39:27 +01:00
|
|
|
|
|
|
|
ubootQemuArm = final.buildUBoot {
|
|
|
|
defconfig = "qemu_arm_defconfig";
|
|
|
|
extraMeta.platforms = ["armv7l-linux"];
|
|
|
|
filesToInstall = ["u-boot.bin"];
|
|
|
|
# enable looking for boot files on ubifs. this is unused at
|
|
|
|
# present, but added in the expectation of a future test
|
|
|
|
extraPatches = [ ./pkgs/u-boot/0001-add-ubifs-to-boot-targets.patch ];
|
|
|
|
extraConfig = ''
|
|
|
|
CONFIG_CMD_UBI=y
|
|
|
|
CONFIG_CMD_UBIFS=y
|
2023-12-06 00:16:53 +01:00
|
|
|
CONFIG_BOOTSTD=y
|
|
|
|
CONFIG_BOOTMETH_DISTRO=y
|
2023-12-18 23:42:29 +01:00
|
|
|
CONFIG_LZMA=y
|
|
|
|
CONFIG_CMD_LZMADEC=y
|
|
|
|
CONFIG_SYS_BOOTM_LEN=0x1000000
|
2023-12-05 00:39:27 +01:00
|
|
|
'';
|
|
|
|
};
|
2023-12-13 22:54:15 +01:00
|
|
|
|
|
|
|
# gnufdisk = prev.gnufdisk.override {
|
|
|
|
# guile = null;
|
|
|
|
# };
|
|
|
|
|
|
|
|
# util-linux = prev.util-linux.override {
|
|
|
|
# ncursesSupport = false;
|
|
|
|
# pamSupport = false;
|
|
|
|
# systemdSupport = false;
|
|
|
|
# nlsSupport = false;
|
|
|
|
# translateManpages = false;
|
|
|
|
# capabilitiesSupport = false;
|
|
|
|
# };
|
|
|
|
|
2022-09-20 00:51:38 +02:00
|
|
|
}
|