summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-09-17 00:24:05 +0200
committermakefu <github@syntax-fehler.de>2018-09-17 00:24:05 +0200
commit98ffcd6fd64adc2773bb1fc6f7f838016b5582f8 (patch)
treee9ccea5c7c4f0355a180bb7949bef07e9623f99f
parentf6893b0cd08552e8f9cec9c8cc526470f49e6848 (diff)
ma source.nix: rip
-rw-r--r--makefu/krops.nix4
-rw-r--r--makefu/source.nix122
2 files changed, 4 insertions, 122 deletions
diff --git a/makefu/krops.nix b/makefu/krops.nix
index 3838db635..f8ea6f7ef 100644
--- a/makefu/krops.nix
+++ b/makefu/krops.nix
@@ -18,6 +18,7 @@
unstable = false; #unstable channel checked out
mic92 = false;
nms = false;
+ arm6 = false;
clever_kexec = false;
} // import (./. + "/1systems/${name}/source.nix");
source = { test }: lib.evalSource [
@@ -29,6 +30,9 @@
nixpkgs = if test || host-src.full then {
git.ref = nixpkgs-src.rev;
git.url = nixpkgs-src.url;
+ } else if host-src.arm6 then {
+ # TODO: we want to track the unstable channel
+ symlink = "/nix/var/nix/profiles/per-user/root/channels/nixos/";
} else {
file = "/home/makefu/store/${nixpkgs-src.rev}";
};
diff --git a/makefu/source.nix b/makefu/source.nix
deleted file mode 100644
index c350fe72c..000000000
--- a/makefu/source.nix
+++ /dev/null
@@ -1,122 +0,0 @@
-with import <stockholm/lib>;
-host@{ name,
- override ? {}
-, secure ? false
-, full ? false
-, torrent ? false
-, hw ? false
-, musnix ? false
-, python ? false
-, unstable ? false #unstable channel checked out
-, mic92 ? false
-, nms ? false
-, clever_kexec ?false
-}:
-let
- builder = if getEnv "dummy_secrets" == "true"
- then "buildbot"
- else "makefu";
- _file = <stockholm> + "/makefu/1systems/${name}/source.nix";
- pkgs = import <nixpkgs> {
- overlays = map import [
- <stockholm/krebs/5pkgs>
- <stockholm/submodules/nix-writers/pkgs>
- ];
- };
- # TODO: automate updating of this ref + cherry-picks
- ref = "8f991294288"; # nixos-18.03 @ 2018-08-06
- # + do_sqlite3 ruby: 55a952be5b5
- # + exfat-nofuse bump: ee6a5296a35
- # + uhub/sqlite: 5dd7610401747
-
-in
- evalSource (toString _file) [
- {
- nixos-config.symlink = "stockholm/makefu/1systems/${name}/config.nix";
- # always perform a full populate when buildbot
- nixpkgs = if full || (builder == "buildbot" ) then {
- git = {
- url = https://github.com/makefu/nixpkgs;
- inherit ref;
- };
- } else {
- # right now it is simply extracted revision folder
-
- ## prepare so we do not have to wait for rsync:
- ## cd /var/src; curl https://github.com/nixos/nixpkgs/tarball/125ffff -L | tar zx && mv NixOS-nixpkgs-125ffff nixpkgs
- file = "/home/makefu/store/${ref}";
- };
-
- secrets = getAttr builder {
- buildbot.file = toString <stockholm/makefu/0tests/data/secrets>;
- makefu.pass = {
- inherit name;
- dir = "${getEnv "HOME"}/.secrets-pass";
- };
- };
-
-
- stockholm.file = toString <stockholm>;
- stockholm-version.pipe = "${pkgs.coreutils}/bin/echo derp";
- }
- (mkIf ( musnix ) {
- musnix.git = {
- url = https://github.com/musnix/musnix.git;
- ref = "master"; # follow the musnix channel, lets see how this works out
- };
- })
-
- (mkIf ( hw ) {
- nixos-hardware.git = {
- url = https://github.com/nixos/nixos-hardware.git;
- ref = "30fdd53";
- };
- })
-
- (mkIf ( python ) {
- python.git = {
- url = https://github.com/garbas/nixpkgs-python;
- ref = "cac319b7";
- };
- })
-
- (mkIf ( torrent ) {
- torrent-secrets = getAttr builder {
- buildbot.file = toString <stockholm/makefu/0tests/data/secrets>;
- makefu.pass = {
- name = "torrent";
- dir = "${getEnv "HOME"}/.secrets-pass";
- };
- };
- })
-
- (mkIf ( unstable ) {
- nixpkgs-unstable.git = {
- url = https://github.com/nixos/nixpkgs-channels;
- ref = "nixos-unstable";
- };
- })
-
- (mkIf ( mic92 ) {
- mic92.git = {
- url = https://github.com/Mic92/dotfiles/;
- ref = "48a1f49";
- };
- })
-
- (mkIf ( nms ) {
- nms.git = {
- url = https://github.com/r-raymond/nixos-mailserver;
- ref = "v2.1.2";
- };
- })
-
- (mkIf ( clever_kexec ) {
- clever_kexec.git = {
- url = https://github.com/cleverca22/nix-tests;
- ref = "5a670de7f2decfaafc95c34ffeb0f1896662f3d7";
- };
- })
-
- override
- ]