From b140857acd2394b969ee60c24edab0e8a6a1b241 Mon Sep 17 00:00:00 2001 From: kat witch Date: Sat, 27 Feb 2021 03:59:05 +0000 Subject: [PATCH] Cursed way to get vendor-reset on latest --- config/common/default.nix | 3 +-- config/hosts/athame/gitea.nix | 1 + pkgs/default.nix | 2 +- pkgs/vendor-reset/default.nix | 15 ++++++++++----- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/config/common/default.nix b/config/common/default.nix index ccef5818..5f26c2d0 100644 --- a/config/common/default.nix +++ b/config/common/default.nix @@ -6,8 +6,7 @@ let in { imports = [ ../../modules ../users (sources.home-manager + "/nixos") ]; - #boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; - #boot.kernelParams = [ "quiet" ]; + boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; nixpkgs.config = { allowUnfree = true; }; nix = { diff --git a/config/hosts/athame/gitea.nix b/config/hosts/athame/gitea.nix index 47660590..90ed5956 100644 --- a/config/hosts/athame/gitea.nix +++ b/config/hosts/athame/gitea.nix @@ -6,6 +6,7 @@ disableRegistration = true; domain = "git.kittywit.ch"; rootUrl = "https://git.kittywit.ch"; + httpAddress = "127.0.0.1"; }; services.nginx.virtualHosts."git.kittywit.ch" = { diff --git a/pkgs/default.nix b/pkgs/default.nix index f9ef3d49..59592a87 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -14,7 +14,7 @@ let discord = pkgs.discord.override { nss = pkgs.nss_latest; }; arc = import sources.arc-nixexprs { inherit pkgs; }; - + unstable = import sources.nixpkgs-unstable { inherit pkgs; }; nur = import sources.NUR { inherit pkgs; }; linuxPackagesFor = kernel: diff --git a/pkgs/vendor-reset/default.nix b/pkgs/vendor-reset/default.nix index 3e015eae..ae0ba7cd 100644 --- a/pkgs/vendor-reset/default.nix +++ b/pkgs/vendor-reset/default.nix @@ -1,10 +1,12 @@ -{ stdenv, fetchFromGitHub, kernel }: +{ stdenv, fetchFromGitHub, kernel, pkgs }: let - version = "0.0.18"; - rev = "765b05cdbd4de854c05f771c954ecee0e019d734"; + version = "0.1.1"; + rev = "225a49a40941e350899e456366265cf82b87ad25"; sha256 = - "0ayn8128i0bfwzcmkn0x2alfplbsmvp0c63z56w11ywyysf342qw"; # TODO add this + "071zd8slra0iqsvzqpp6lcvg5dql5hkn161gh9aq34wix7pwzbn5"; + sources = import ../../nix/sources.nix; + unstable = import sources.nixpkgs-unstable { inherit pkgs; }; in stdenv.mkDerivation { name = "vendor-reset-${version}-${kernel.version}"; @@ -17,7 +19,10 @@ in stdenv.mkDerivation { inherit sha256; }; - nativeBuildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ + unstable.pkgs.binutils + unstable.pkgs.libelf + ]; hardeningDisable = [ "pic" ]; makeFlags = [