From 406d1cc6ca73442f782a835d75011f7e0fbe4e9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kha=C3=AFs=20COLIN?= Date: Mon, 12 Aug 2024 13:49:37 +0200 Subject: [PATCH] chore(sourcehut): remove all traces of custom cacert package fuckery I found out that you can set an env variable to make python's request use the global cert store, this sidesteps the issue I have been having with sourcehut. --- nixos/configuration.nix | 4 ++-- nixos/flake.nix | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 9e799ce..4382570 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -2,12 +2,12 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ pkgs, nixpkgsWithPatchedCACert, ... }: +{ pkgs, ... }: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - (import ./sourcehut.nix { pkgs = nixpkgsWithPatchedCACert; }) + ./sourcehut.nix ]; # Bootloader. diff --git a/nixos/flake.nix b/nixos/flake.nix index fec1d3c..047006d 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -7,20 +7,14 @@ }; }; outputs = { nixpkgs, nixos-06cb-009a-fingerprint-sensor, ... }: - let - nixpkgsWithPatchedCACert = nixpkgs.override (import ./overlays/cacert.nix); - in { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ ./configuration.nix - #(let nixpkgs = nixpkgsWithPatchedCACert; in ./sourcehut.nix) - #(import ./sourcehut.nix { nixpkgs = nixpkgsWithPatchedCACert; }) nixos-06cb-009a-fingerprint-sensor.nixosModules.open-fprintd nixos-06cb-009a-fingerprint-sensor.nixosModules.python-validity ]; - extraArgs = { inherit nixpkgsWithPatchedCACert; }; }; }; }