peter/haccfiles
1
0
Fork 0
forked from hacc/haccfiles
Code Issues Pull requests Projects Releases Wiki Activity

sources: update nixpkgs to 21.05

Browse source 
this caused various other changes related to nftables, we are now using
hexchen's fork of pbb's module.
This commit is contained in:
hexchen 2021-07-29 20:31:14 +00:00
parent cbeb0e86c1
commit cf5062adfd
5 changed files with 24 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/default.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, modules, ... }:
let let
sources = import ../nix/sources.nix; sources = import ../nix/sources.nix;
@ -7,10 +7,10 @@ in {
../modules ../modules
./users.nix ./users.nix
(sources.home-manager + "/nixos") (sources.home-manager + "/nixos")
(sources.pbb-nixfiles + "/modules/nftables") modules.network.nftables
]; ];
boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; boot.kernelPackages = lib.mkDefault pkgs.linuxPackages;
boot.kernelParams = [ "quiet" ]; boot.kernelParams = [ "quiet" ];
networking.domain = lib.mkDefault "hacc.space"; networking.domain = lib.mkDefault "hacc.space";
@ -79,5 +79,5 @@ in {
access_log off; access_log off;
''; '';
petabyte.nftables.enable = true; networking.nftables.enable = true;
} }

6
default.nix
View file

@ -2,6 +2,10 @@ rec {
sources = import ./nix/sources.nix; sources = import ./nix/sources.nix;
pkgs = import ./pkgs {}; pkgs = import ./pkgs {};
inherit (pkgs) lib; inherit (pkgs) lib;
inherit (import (sources.nix-hexchen + "/lib/hosts.nix") { inherit pkgs; hostsDir = ./hosts; commonImports = [./common]; pkgsPath = ./pkgs; }) hosts groups; inherit (import (sources.nix-hexchen + "/lib/hosts.nix") {
inherit pkgs sources;
inherit ((import sources.nix-hexchen) {}) modules;
hostsDir = ./hosts; commonImports = [./common]; pkgsPath = ./pkgs;
}) hosts groups;
deploy = import (sources.nix-hexchen + "/lib/deploy.nix") { inherit pkgs hosts groups; }; deploy = import (sources.nix-hexchen + "/lib/deploy.nix") { inherit pkgs hosts groups; };
} }

4
modules/nftnat/default.nix
View file

@ -41,9 +41,7 @@ in {
}; };
}; };
petabyte.nftables = { networking.nftables = {
enable = true;
extraConfig = '' extraConfig = ''
table ip nat { table ip nat {
chain prerouting { chain prerouting {

25
nix/sources.json
View file

@ -6,15 +6,15 @@
"type": "git" "type": "git"
}, },
"home-manager": { "home-manager": {
"branch": "release-20.09", "branch": "release-21.05",
"description": "Manage a user environment using Nix [maintainer=@rycee] ", "description": "Manage a user environment using Nix [maintainer=@rycee] ",
"homepage": "https://nix-community.github.io/home-manager/", "homepage": "https://nix-community.github.io/home-manager/",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "49706878e1580d796cc99b63574310405935113f", "rev": "9c0abed5228d54aad120b4bc757b6f5935aeda1c",
"sha256": "07f903ij0czyhly8kvwjazvz3s6kflxzh5fs6j8781lkxsy47i9f", "sha256": "05pfa26p9k1gpir9sniwg195cqqc9v6yp9b5f9hrjhlh3jm14bgq",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nix-community/home-manager/archive/49706878e1580d796cc99b63574310405935113f.tar.gz", "url": "https://github.com/nix-community/home-manager/archive/9c0abed5228d54aad120b4bc757b6f5935aeda1c.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"mattermost-server": { "mattermost-server": {
@ -57,11 +57,12 @@
}, },
"nix-hexchen": { "nix-hexchen": {
"branch": "main", "branch": "main",
"repo": "https://gitlab.com/hexchen/nixfiles.git", "ref": "main",
"rev": "83b511d9a3754ded187891c711b3dbbef82887d3", "repo": "https://gitlab.com/hexchen/nixfiles",
"sha256": "1024vl0bgmcb8g91pqcqc601xh90nxp82p0z9imp11fwb1fx7756", "rev": "1ae89906c8fb5cf45384eb2821bd89c807c1564f",
"sha256": "03yicni5jfr5qjillj3dp899n3lq7dhqrg66dr0w1vy12d0lp43s",
"type": "tarball", "type": "tarball",
"url": "https://gitlab.com/hexchen/nixfiles/-/archive/83b511d9a3754ded187891c711b3dbbef82887d3/nixfiles-83b511d9a3754ded187891c711b3dbbef82887d3.tar.gz", "url": "https://gitlab.com/hexchen/nixfiles/-/archive/1ae89906c8fb5cf45384eb2821bd89c807c1564f.tar.gz",
"url_template": "<repo>/-/archive/<rev>.tar.gz" "url_template": "<repo>/-/archive/<rev>.tar.gz"
}, },
"nixos-mailserver": { "nixos-mailserver": {
@ -74,15 +75,15 @@
"url_template": "<repo>/-/archive/<rev>.tar.gz" "url_template": "<repo>/-/archive/<rev>.tar.gz"
}, },
"nixpkgs": { "nixpkgs": {
"branch": "nixos-20.09", "branch": "nixos-21.05",
"description": "Nix Packages collection", "description": "Nix Packages collection",
"homepage": "", "homepage": "",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "068984c00e0d4e54b6684d98f6ac47c92dcb642e", "rev": "382039c05a16827a7f0731183e862366b66b422f",
"sha256": "00j4xv4lhhqwry7jd67brnws4pwb8vn660n43pvxpkalbpxszwfg", "sha256": "08mvanp4400zfz1knyxsjhkc7ryjlaa9awcg763ghj235wk6mlld",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nixos/nixpkgs/archive/068984c00e0d4e54b6684d98f6ac47c92dcb642e.tar.gz", "url": "https://github.com/nixos/nixpkgs/archive/382039c05a16827a7f0731183e862366b66b422f.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {

8
pkgs/default.nix
View file

@ -10,13 +10,7 @@ let
newpkgs = { newpkgs = {
alps = callPackage ./alps {}; alps = callPackage ./alps {};
docker = (pkgs.callPackage (pkgs.path + "/pkgs/applications/virtualization/docker") { docker = pkgs.docker.overrideAttrs (super: {
iptables = pkgs.writeScriptBin "iptables" ''
#!${pkgs.runtimeShell}
echo docker tried to run the following iptables command: $@
exit 0
'';
}).docker_19_03.overrideAttrs (super: {
extraPath = super.extraPath + ":${pkgs.zfs}/bin"; extraPath = super.extraPath + ":${pkgs.zfs}/bin";
}); });