CONTRIBUTING.md

@@ -1,16 +0,0 @@
-# Contributing
-
-[ This is a placeholder, because it's early days and the volume of contributions thus far can be counted in an eggcup ]
-
-* Contributions are very welcome
-
-* Please open an issue (or otherwise establish some kind of dialogue) before you send a PR I haven't asked for.
-Just so I know it's expected and you're not wasting time doing something I won't accept or have already started on
-
-* The Nix code in Liminix is MIT-licenced (same as Nixpkgs), but the code it combines from other places (e.g. Linux, OpenWRT) may
-have a variety of licences.  I have no intention of asking for copyright assignment: just like when submitting to the
-Linux kernel you retain the copyright on the code you contribute.
-
-* Please govern yourself in Liminix project venues according to the guidance in the [geekfeminism "Community Anti-harassment Policy"](https://geekfeminism.wikia.org/wiki/Community_anti-harassment/Policy).
-
-* If you've read the preceding bullets and don't find anything to disagree with, open a PR

LICENSE

@@ -1,24 +0,0 @@
-This is the MIT License. It applies to all original Nix code in
-Liminix, and the code which was copied from NixWRT.  Content from
-other projects (e.g the Linux kernel project, OpenWrt) is included.
-under the terms of the licences of those projects.
-
-Copyright (c) 2018-2022 Daniel Barlow and contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -125,20 +125,6 @@ filesystem, and you can run `nix-store --query` on it:
     nix-store -q --tree manifest
 
 
-## Contributing
-
-Contributions are welcome, though in these early days there may be a
-bit of back and forth involved before patches are merged.  Have a read
-of [CONTRIBUTING](CONTRIBUTING.md) and [STYLE](STYLE.md) and try to
-intuit the unarticulated vision :-)
-
-Liminix' primary repo is https://gti.telent.net/dan/liminix. There's a
-[mirror on Github](https://github.com/telent/liminix) for convenience
-and visibility: you can open PRs against that but be aware that the
-process of merging them may be arcane. Some day, we will have
-federated Gitea using ActivityPub.
-
-
 ## Articles of interest
 
 * [Build Safety of Software in 28 Popular Home Routers](https://cyber-itl.org/assets/papers/2018/build_safety_of_software_in_28_popular_home_routers.pdf):

default.nix

@@ -14,7 +14,7 @@ let
   ] nixpkgs.pkgs;
   squashfs = liminix.builders.squashfs config.filesystem.contents;
   kernel = callPackage ./kernel {
-    inherit (config.kernel) config checkedConfig;
+    inherit (config.kernel) config;
   };
 in {
   outputs = {

devices/qemu.nix

@@ -231,6 +231,10 @@
       NET_ACT_PEDIT= "m";
       NET_ACT_SIMP= "m";
       NET_ACT_SKBEDIT= "m";
+      CFG80211= "m";
+      MAC80211= "m";
+      MAC80211_MESH= "y";
+      RFKILL= "m";
       DEVTMPFS= "y";
       CONNECTOR= "m";
       MTD= "y";
@@ -433,12 +437,7 @@
       RCU_CPU_STALL_TIMEOUT = "60";
       ENABLE_DEFAULT_TRACERS = "y";
 
-      CFG80211= "y";
-      MAC80211= "y";
-      MAC80211_MESH= "y";
-      RFKILL= "y";
-      WLAN = "y";
-      MAC80211_HWSIM = "y";
+
       SQUASHFS = "y";
       SQUASHFS_XZ = "y";
       VIRTIO_PCI = "y";

kernel/default.nix

@@ -5,7 +5,6 @@
 , fetchFromGitHub
 
 , config
-, checkedConfig
 }:
 let
   source = fetchFromGitHub {
@@ -37,6 +36,7 @@ let
 in
 {
   vmlinux = callPackage ./vmlinux.nix {
-    inherit tree config checkedConfig;
+    inherit tree;
+    inherit config;
   };
 }