colin
/
nix-files
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

experimental flake support

This commit is contained in:
Colin 2022-05-21 00:07:49 +00:00
parent 9889ee0937
commit 8ec94691fa
2 changed files with 52 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
configuration.nix
View File

@ -8,24 +8,19 @@
# nix-option ## query options -- including their SET VALUE; similar to search: https://search.nixos.org/options
# nixos-rebuild switch --upgrade ## pull changes from the nixos channel (e.g. security updates) and rebuild
{ config, lib, modulesPath, pkgs, specialArgs, options }:
{ config, modulesPath, pkgs, specialArgs, options }:
let
pkgsUnstable = import (builtins.fetchTarball {
# Descriptive name to make the store path easier to identify
name = "nixos-unstable-2022-05-05";
# Commit hash for master on above date (s/commits/archive and append .tar.gz)
# see https://github.com/NixOS/nixpkgs/commits/nixos-unstable
url = "https://github.com/NixOS/nixpkgs/archive/c777cdf5c564015d5f63b09cc93bef4178b19b01.tar.gz";
# Hash obtained using `nix-prefetch-url --unpack <url>`
sha256 = "0r2xhflcy5agaz4a3b8pxiyiwh32s1kl3swv73flnj1x3v69s8bm";
}) {};
in
{
imports = [
./cfg
./modules
];
# enable flake support.
# the real config root lives in flake.nix
nix = {
#package = pkgs.nixFlakes;
package = pkgs.nixUnstable;
extraOptions = ''
experimental-features = nix-command flakes
'';
};
nixpkgs.overlays = [
(self: super: {
@ -41,10 +36,10 @@ in
# gitea: 1.16.5 contains a fix which makes manual user approval *actually* work.
# https://github.com/go-gitea/gitea/pull/19119
# safe to remove after 1.16.5 (or 1.16.7 if we need db compat?)
gitea = pkgsUnstable.gitea;
gitea = pkgs.unstable.gitea;
# try a newer rpi4 u-boot
# ubootRaspberryPi4_64bit = pkgsUnstable.ubootRaspberryPi4_64bit;
# ubootRaspberryPi4_64bit = pkgs.unstable.ubootRaspberryPi4_64bit;
ubootRaspberryPi4_64bit = self.callPackage ./pkgs/ubootRaspberryPi4_64bit { pkgs = super; };
})
];

39
flake.nix Normal file
View File

@ -0,0 +1,39 @@
# docs:
# https://nixos.wiki/wiki/Flakes
# https://serokell.io/blog/practical-nix-flakes
{
inputs = {
nixpkgs.url = "nixpkgs/nixos-21.11";
pkgsUnstable.url = "nixpkgs/c777cdf5c564015d5f63b09cc93bef4178b19b01";
};
outputs = { self, pkgsUnstable, nixpkgs }: {
nixosConfigurations.uninsane = nixpkgs.lib.nixosSystem {
inherit (self.packages.aarch64-linux) pkgs;
pkgs.unstable = pkgsUnstable;
system = "aarch64-linux";
modules = [
./configuration.nix
./cfg
./modules
];
};
packages = nixpkgs.lib.genAttrs nixpkgs.lib.platforms.all (system:
{
pkgs = import nixpkgs { inherit system; config.allowUnfree = true; };
}
);
# flake-utils.lib.eachDefaultSystem (system:
# let pkgs = nixpkgs.legacyPackages.${system};
# in {
# # packages.hello = pkgs.hello;
# # devShell = pkgs.mkShell { buildInputs = [ pkgs.hello pkgs.cowsay ]; };
# nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
# system = "${system}";
# };
# }
# );
};
}