diff --git a/flake.lock b/flake.lock index 24de1d5..0b763b4 100644 --- a/flake.lock +++ b/flake.lock @@ -268,11 +268,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1720418205, - "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", + "lastModified": 1720542800, + "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "655a58a72a6601292512670343087c2d75d859c1", + "rev": "feb2849fdeb70028c70d73b848214b00d324a497", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9b9e1c4..5e0dc12 100644 --- a/flake.nix +++ b/flake.nix @@ -114,6 +114,7 @@ clerie-sops-config clerie-sops-edit chromium-incognito + git-checkout-github-pr iot-data nix-remove-result-links nixfiles-auto-install diff --git a/pkgs/git-checkout-github-pr/default.nix b/pkgs/git-checkout-github-pr/default.nix new file mode 100644 index 0000000..9be9a40 --- /dev/null +++ b/pkgs/git-checkout-github-pr/default.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: + +pkgs.writeShellApplication { + name = "git-checkout-github-pr"; + text = builtins.readFile ./git-checkout-github-pr.sh; + runtimeInputs = with pkgs; [ + git + ]; +} diff --git a/pkgs/git-checkout-github-pr/git-checkout-github-pr.sh b/pkgs/git-checkout-github-pr/git-checkout-github-pr.sh new file mode 100755 index 0000000..b182ab7 --- /dev/null +++ b/pkgs/git-checkout-github-pr/git-checkout-github-pr.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +set -euo pipefail + +ID="" +REMOTE="origin" +LOCAL_BRANCH="" + +while [[ $# -gt 0 ]]; do + case $1 in + --remote) + REMOTE="$2" + shift + shift + ;; + --local-branch) + LOCAL_BRANCH="$2" + shift + shift + ;; + *) + if [[ -z "${ID}" ]]; then + ID="$1" + shift + else + echo "Unknown option $1" + exit 1 + fi + ;; + esac +done + +if [[ -z "${ID}" ]]; then + echo "Specify GitHub PR number" + exit 1 +fi + +if [[ -z "${LOCAL_BRANCH}" ]]; then + LOCAL_BRANCH="pr/${ID}" +fi + +git fetch "${REMOTE}" "pull/${ID}/head:${LOCAL_BRANCH}" + +git switch "${LOCAL_BRANCH}" diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index 97c7fdf..1ccd9c7 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -7,6 +7,7 @@ final: prev: { clerie-sops-edit = final.callPackage ./clerie-sops/clerie-sops-edit.nix {}; clerie-update-nixfiles = final.callPackage ./clerie-update-nixfiles/clerie-update-nixfiles.nix {}; chromium-incognito = final.callPackage ./chromium-incognito {}; + git-checkout-github-pr = final.callPackage ./git-checkout-github-pr {}; iot-data = final.python3.pkgs.callPackage ./iot-data {}; nix-remove-result-links = final.callPackage ./nix-remove-result-links {}; nixfiles-auto-install = final.callPackage ./nixfiles/nixfiles-auto-install.nix {};