From 1240356b37889ade5a6c8c0096257602bbdfb530 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Fri, 23 Apr 2021 01:10:02 +0200 Subject: [PATCH 1/6] doc: fix grammar: "your" -> "you're" where it's meant to be a contraction of "you are" rather than a possessive pronoun --- doc/CONTRIBUTING.md | 2 +- doc/integrations/cachix.md | 2 +- doc/start/from-nixos.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/CONTRIBUTING.md b/doc/CONTRIBUTING.md index 5b75798..bb480ae 100644 --- a/doc/CONTRIBUTING.md +++ b/doc/CONTRIBUTING.md @@ -21,7 +21,7 @@ If you wish to contribute please follow these guidelines: * The commit message follows the same semantics as [nixpkgs][nixpkgs]. * You can use a `#` symbol to specify ambiguities. For example, - `develop#zsh: ` would tell me that your updating the + `develop#zsh: ` would tell me that you're updating the `zsh` subprofile living under the `develop` profile. [nixpkgs-fmt]: https://github.com/nix-community/nixpkgs-fmt diff --git a/doc/integrations/cachix.md b/doc/integrations/cachix.md index 3e4f3b5..b025459 100644 --- a/doc/integrations/cachix.md +++ b/doc/integrations/cachix.md @@ -1,6 +1,6 @@ # Cachix The system will automatically pull a cachix.nix at the root if one exists. -This is usually created automatically by a `sudo cachix use`. If your more +This is usually created automatically by a `sudo cachix use`. If you're more inclined to keep the root clean, you can drop any generated files in the `cachix` directory into the `profiles/cachix` directory without further modification. diff --git a/doc/start/from-nixos.md b/doc/start/from-nixos.md index bbb0e55..3e9a28e 100644 --- a/doc/start/from-nixos.md +++ b/doc/start/from-nixos.md @@ -1,7 +1,7 @@ # From NixOS ## Generate Configuration -Assuming your happy with your existing partition layout, you can generate a +Assuming you're happy with your existing partition layout, you can generate a basic NixOS configuration for your system using: ```sh flk up @@ -28,7 +28,7 @@ Now might be a good time to read the docs on [suites](../concepts/suites.md) and > them directly into a host module of your own making, and commit that instead. # Installation -Once your ready to deploy `hosts/my-host.nix`: +Once you're ready to deploy `hosts/my-host.nix`: ```sh flk my-host switch ``` From 12b41f24480ff46a2291a2bf1f393a13f19a6cd1 Mon Sep 17 00:00:00 2001 From: Pacman99 Date: Fri, 23 Apr 2021 23:51:51 -0700 Subject: [PATCH 2/6] devosSystem: fix iso build - can't remove core --- lib/devos/devosSystem.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/devos/devosSystem.nix b/lib/devos/devosSystem.nix index b0f53fd..f194f3b 100644 --- a/lib/devos/devosSystem.nix +++ b/lib/devos/devosSystem.nix @@ -20,8 +20,7 @@ lib.nixosSystem (args // { # avoid unwanted systemd service startups # all strings in disabledModules get appended to modulesPath # so convert each to list which can be coerced to string - disabledModules = map (x: [ x ]) - (lib.remove modules.core suites.allProfiles); + disabledModules = map lib.singleton suites.allProfiles; nix.registry = lib.mapAttrs (n: v: { flake = v; }) inputs; From 832d3bd69782015a0f4b6001e050d18d5f8ea9c8 Mon Sep 17 00:00:00 2001 From: Pacman99 Date: Sat, 24 Apr 2021 00:08:49 -0700 Subject: [PATCH 3/6] profilesTest/mkHosts: include host's configuration --- lib/devos/mkHosts.nix | 2 +- lib/pkgs-lib/tests/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/devos/mkHosts.nix b/lib/devos/mkHosts.nix index abb7c4e..cb3c316 100644 --- a/lib/devos/mkHosts.nix +++ b/lib/devos/mkHosts.nix @@ -90,7 +90,7 @@ let lib = { lib = { inherit specialArgs; }; lib.testModule = { - imports = builtins.attrValues modules; + imports = [ local ] ++ builtins.attrValues modules; }; }; in diff --git a/lib/pkgs-lib/tests/default.nix b/lib/pkgs-lib/tests/default.nix index 3c28468..d924a80 100644 --- a/lib/pkgs-lib/tests/default.nix +++ b/lib/pkgs-lib/tests/default.nix @@ -48,7 +48,7 @@ let }; testScript = '' - machine.systemctl("is-system-running --wait") + ${host.config.networking.hostName}.systemctl("is-system-running --wait") ''; }; From ae357cb098ea2753f3ac6e4a412920762a36a292 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Wed, 21 Apr 2021 23:39:03 -0600 Subject: [PATCH 4/6] Check & Upload to Cache with GitHub Action --- .github/workflows/check.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/check.yml diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml new file mode 100644 index 0000000..e4fc197 --- /dev/null +++ b/.github/workflows/check.yml @@ -0,0 +1,28 @@ +name: "Check & Cachix" +on: + push: + branches: + - core + - trying + - staging +jobs: + check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.4 + - uses: cachix/install-nix-action@v13 + with: + install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-2.4pre20210415_76980a1/install + extra_nix_config: | + experimental-features = nix-command flakes + system-features = nixos-test benchmark big-parallel kvm recursive-nix + substituters = https://nrdxp.cachix.org https://nix-community.cachix.org https://cache.nixos.org + trusted-public-keys = nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= + - uses: cachix/cachix-action@v10 + with: + name: nrdxp + signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + - run: nix -Lv flake check + - run: nix -Lv build ".#nixosConfigurations.NixOS.config.system.build.toplevel" + - run: nix -Lv develop -c echo OK From b03fd1496d118d3413e876021de86725ea5cac5b Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Wed, 21 Apr 2021 23:40:44 -0600 Subject: [PATCH 5/6] pkgs: fix flake hash --- flake.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 3996268..a20aca5 100644 --- a/flake.lock +++ b/flake.lock @@ -216,7 +216,7 @@ ] }, "locked": { - "narHash": "sha256-XG4TOZObj2Wd8KiqnHgtlWjjMbJOIJB7+DxUFzMCXw8=", + "narHash": "sha256-Zs7dc0dNNa0Z3//+Gckxj7SKrMqVovY0xZZ1z8xWnEg=", "path": "./pkgs", "type": "path" }, From 7a825bbeb62261954bf44d7ac5a8f2870e77d8c4 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Thu, 22 Apr 2021 00:32:00 -0600 Subject: [PATCH 6/6] ci: update bors.toml for new pipeline --- bors.toml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/bors.toml b/bors.toml index 2d565db..72690c0 100644 --- a/bors.toml +++ b/bors.toml @@ -1,7 +1,4 @@ -status = [ - "ci/hercules/evaluation", - "ci/hercules/derivations" -] +status = [ "check" ] required_approvals = 1