Compare commits
No commits in common. "a9d1582b534439af96ebac11f3eae4eeeb3b1122" and "e1ae986cf66c396f6d5970735abd2042c99ead1f" have entirely different histories.
a9d1582b53
...
e1ae986cf6
|
@ -3,6 +3,7 @@
|
||||||
, linotify
|
, linotify
|
||||||
, anoia
|
, anoia
|
||||||
, lualinux
|
, lualinux
|
||||||
|
, lua
|
||||||
}:
|
}:
|
||||||
writeFennel "acquire-wan-address" {
|
writeFennel "acquire-wan-address" {
|
||||||
packages = [ linotify anoia lualinux ];
|
packages = [ linotify anoia lualinux ];
|
||||||
|
|
41
overlay.nix
41
overlay.nix
|
@ -113,21 +113,6 @@ extraPkgs // {
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
elfutils =
|
|
||||||
let native = (with final.stdenv; (buildPlatform == hostPlatform));
|
|
||||||
in if native
|
|
||||||
then prev.elfutils
|
|
||||||
else
|
|
||||||
let
|
|
||||||
e = prev.elfutils.overrideAttrs(o: {
|
|
||||||
configureFlags = o.configureFlags ++[
|
|
||||||
"ac_cv_has_stdatomic=no"
|
|
||||||
];
|
|
||||||
});
|
|
||||||
in e.override {
|
|
||||||
enableDebuginfod = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
hostapd =
|
hostapd =
|
||||||
let
|
let
|
||||||
config = [
|
config = [
|
||||||
|
@ -156,10 +141,6 @@ extraPkgs // {
|
||||||
});
|
});
|
||||||
in h.override { openssl = null; sqlite = null; };
|
in h.override { openssl = null; sqlite = null; };
|
||||||
|
|
||||||
# berlekey db needs libatomic which we haven't figured out yet.
|
|
||||||
# disabling it means we don't have arpd
|
|
||||||
iproute2 = prev.iproute2.override { db = null; };
|
|
||||||
|
|
||||||
kexec-tools-static = prev.kexec-tools.overrideAttrs(o: {
|
kexec-tools-static = prev.kexec-tools.overrideAttrs(o: {
|
||||||
# For kexecboot we copy kexec into a ramdisk on the system being
|
# For kexecboot we copy kexec into a ramdisk on the system being
|
||||||
# upgraded from. This is more likely to work if kexec is
|
# upgraded from. This is more likely to work if kexec is
|
||||||
|
@ -196,11 +177,7 @@ extraPkgs // {
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
||||||
openssl = prev.openssl.overrideAttrs (o:
|
openssl = prev.openssl.overrideAttrs (o: {
|
||||||
with final;
|
|
||||||
let cross = stdenv.buildPlatform != stdenv.hostPlatform;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
# we want to apply
|
# we want to apply
|
||||||
# https://patch-diff.githubusercontent.com/raw/openssl/openssl/pull/20273.patch";
|
# https://patch-diff.githubusercontent.com/raw/openssl/openssl/pull/20273.patch";
|
||||||
# which disables overriding the -march cflags to the wrong values,
|
# which disables overriding the -march cflags to the wrong values,
|
||||||
|
@ -209,19 +186,11 @@ extraPkgs // {
|
||||||
postPatch =
|
postPatch =
|
||||||
o.postPatch
|
o.postPatch
|
||||||
+ (
|
+ (
|
||||||
lib.optionalString cross ''
|
with final;
|
||||||
sed -i.bak 's/linux.*-mips/linux-mops/' Configure
|
lib.optionalString (
|
||||||
''
|
stdenv.buildPlatform != stdenv.hostPlatform
|
||||||
|
) "\nsed -i.bak 's/linux.*-mips/linux-mops/' Configure\n"
|
||||||
);
|
);
|
||||||
# openssl with threads requires stdatomic which drags in libgcc
|
|
||||||
# as a dependency
|
|
||||||
configureFlags = []
|
|
||||||
++ (lib.optional cross "no-threads")
|
|
||||||
++ o.configureFlags;
|
|
||||||
|
|
||||||
# don't need or want this bash script
|
|
||||||
postInstall = o.postInstall +
|
|
||||||
(lib.optionalString cross "rm $bin/bin/c_rehash\n");
|
|
||||||
});
|
});
|
||||||
|
|
||||||
pppBuild = prev.ppp;
|
pppBuild = prev.ppp;
|
||||||
|
|
|
@ -38,10 +38,9 @@
|
||||||
(fn dir [name]
|
(fn dir [name]
|
||||||
(let [dp (assert (ll.opendir name) name)]
|
(let [dp (assert (ll.opendir name) name)]
|
||||||
(fn []
|
(fn []
|
||||||
(case (ll.readdir dp)
|
(match (ll.readdir dp)
|
||||||
(name filetype) (values name filetype)
|
(name type) (values name type)
|
||||||
(nil err) (do (if (> err 0) (print "ERR" err)) (ll.closedir dp) nil)
|
(nil err) (do (if err (print err)) (ll.closedir dp) nil)))))
|
||||||
))))
|
|
||||||
|
|
||||||
(fn rmtree [pathname]
|
(fn rmtree [pathname]
|
||||||
(case (file-type pathname)
|
(case (file-type pathname)
|
||||||
|
|
|
@ -1,14 +1,13 @@
|
||||||
(local inotify (require :inotify))
|
(local inotify (require :inotify))
|
||||||
(local { : file-exists? } (require :anoia))
|
(local { : file-exists? } (require :anoia))
|
||||||
(local { : file-type : dir &as fs } (require :anoia.fs))
|
(local { : file-type : dir &as fs } (require :anoia.fs))
|
||||||
(local ll (require :lualinux))
|
|
||||||
|
|
||||||
(fn read-line [name]
|
(fn read-line [name]
|
||||||
(with-open [f (assert (io.open name :r) (.. "can't open file " name))]
|
(with-open [f (assert (io.open name :r) (.. "can't open file " name))]
|
||||||
(f:read "*l")))
|
(f:read "*l")))
|
||||||
|
|
||||||
(fn watch-fsevents [directory-name]
|
(fn watch-fsevents [directory-name]
|
||||||
(let [handle (inotify.init { :blocking false})]
|
(let [handle (inotify.init)]
|
||||||
(handle:addwatch directory-name
|
(handle:addwatch directory-name
|
||||||
inotify.IN_CREATE
|
inotify.IN_CREATE
|
||||||
inotify.IN_MOVE
|
inotify.IN_MOVE
|
||||||
|
@ -40,16 +39,11 @@
|
||||||
(coroutine.yield self)
|
(coroutine.yield self)
|
||||||
(self:wait))))
|
(self:wait))))
|
||||||
|
|
||||||
(fn read-with-timeout [watcher]
|
|
||||||
(let [fd (watcher:fileno)]
|
|
||||||
(ll.pollin fd 5000)
|
|
||||||
(watcher:read)))
|
|
||||||
|
|
||||||
(fn open [directory]
|
(fn open [directory]
|
||||||
(let [watcher (watch-fsevents directory)
|
(let [watcher (watch-fsevents directory)
|
||||||
has-file? (fn [filename] (file-exists? (.. directory "/" filename)))]
|
has-file? (fn [filename] (file-exists? (.. directory "/" filename)))]
|
||||||
{
|
{
|
||||||
:wait #(read-with-timeout watcher)
|
:wait #(watcher:read)
|
||||||
:ready? (fn [self]
|
:ready? (fn [self]
|
||||||
(and (has-file? "state") (not (has-file? ".lock"))))
|
(and (has-file? "state") (not (has-file? ".lock"))))
|
||||||
:output (fn [_ filename]
|
:output (fn [_ filename]
|
||||||
|
|
Loading…
Reference in New Issue