From 44d1a444ba6bcf692b45a8fc43543916b0278063 Mon Sep 17 00:00:00 2001 From: clerie Date: Mon, 19 May 2025 10:49:07 +0200 Subject: [PATCH 1/3] pkgs/git-show-link: Handle branch names with slashes properly --- pkgs/git-show-link/git-show-link.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/git-show-link/git-show-link.py b/pkgs/git-show-link/git-show-link.py index 3ed4981..63647d0 100755 --- a/pkgs/git-show-link/git-show-link.py +++ b/pkgs/git-show-link/git-show-link.py @@ -41,7 +41,7 @@ def get_remote_branch(): local_branch, remote_branch = branches - remote, branch = remote_branch.split("/") + remote, branch = remote_branch.split("/", maxsplit=1) return { "remote": remote, From b93dc9f16b00b74ab6f3d6c58eb5fcfc84c1286d Mon Sep 17 00:00:00 2001 From: clerie Date: Mon, 19 May 2025 18:43:38 +0200 Subject: [PATCH 2/3] configuration/common: Make Python requests always use system CA --- configuration/common/certificates.nix | 9 +++++++++ configuration/common/default.nix | 1 + 2 files changed, 10 insertions(+) create mode 100644 configuration/common/certificates.nix diff --git a/configuration/common/certificates.nix b/configuration/common/certificates.nix new file mode 100644 index 0000000..ab443fe --- /dev/null +++ b/configuration/common/certificates.nix @@ -0,0 +1,9 @@ +{ config, ... }: + +{ + + environment.sessionVariables = { + REQUESTS_CA_BUNDLE = config.security.pki.caBundle; + }; + +} diff --git a/configuration/common/default.nix b/configuration/common/default.nix index 6d599f5..3c07706 100644 --- a/configuration/common/default.nix +++ b/configuration/common/default.nix @@ -3,6 +3,7 @@ { imports = [ ./backup.nix + ./certificates.nix ./initrd.nix ./locale.nix ./networking.nix From 40a11a09d9fe96f14814bfdccda557920515cd80 Mon Sep 17 00:00:00 2001 From: Flake Update Bot Date: Tue, 20 May 2025 03:03:06 +0200 Subject: [PATCH 3/3] Update nixpkgs 2025-05-20-01-03 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index fb4be50..4358edf 100644 --- a/flake.lock +++ b/flake.lock @@ -551,11 +551,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1746328495, - "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": {